Raise an exception to head off a weird asdcplib error with empty JPEG2000 comments.

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index f418652182118c73c5a8be7e53734d417899db91..c39f65ce6108f4834b29cc19bf3554fefdd4af10 100644 (file)
--- a/wscript
+++ b/wscript
@@ -62,18 +62,16 @@ def options(opt):
     opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP')
     opt.add_option('--openmp', default='gomp', help='specify OpenMP Library to use: omp, gomp (default), iomp')
     opt.add_option('--jpeg', default='oj2', help='specify JPEG library to build with: oj1 or oj2 for OpenJPEG 1.5.x or OpenJPEG 2.1.x respectively')
-    opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11')
 
 def configure(conf):
     conf.load('compiler_cxx')
     conf.load('clang_compilation_database', tooldir=['waf-tools'])
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS'])
-    if conf.options.force_cpp11:
-        conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
     gcc = conf.env['CC_VERSION']
     if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
         conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
+    conf.env.append_value('CXXFLAGS', ['-DLIBDCP_SHARE_PREFIX="%s/share/libdcp"' % conf.env['PREFIX']])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.TARGET_OSX = sys.platform == 'darwin'
@@ -149,7 +147,7 @@ def configure(conf):
         elif conf.options.jpeg == 'oj1':
             conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
         conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
         conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)
 
     if conf.options.target_windows:
@@ -235,22 +233,12 @@ def build(bld):
     if not bld.env.DISABLE_BENCHMARKS:
         bld.recurse('benchmark')
 
-    for i in ['SMPTE-429-7-2006-CPL.xsd',
-              'SMPTE-429-8-2006-PKL.xsd',
-              'SMPTE-429-9-2007-AM.xsd',
-              'xmldsig-core-schema.xsd',
-              'XMLSchema.dtd',
-              'XMLSchema.xsd',
-              'xml.xsd',
-              'PROTO-ASDCP-CPL-20040511.xsd',
-              'PROTO-ASDCP-PKL-20040311.xsd',
-              'PROTO-ASDCP-AM-20040311.xsd',
-              'PROTO-ASDCP-CC-CPL-20070926.xsd',
-              'Main-Stereo-Picture-CPL.xsd',
-              'DCSubtitle.v1.mattsson.xsd',
-              'DCDMSubtitle-2010.xsd' ]:
+    for i in os.listdir('xsd'):
         bld.install_files('${PREFIX}/share/libdcp/xsd', os.path.join('xsd', i))
 
+    for i in ['language', 'region', 'script', 'variant', 'extlang']:
+        bld.install_files('${PREFIX}/share/libdcp/tags', os.path.join('tags', i))
+
     bld.add_post_fun(post)
 
 def dist(ctx):