X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2682439eab8b227e8b860d0cecfad34c504a2d20;hb=a6e9959aeceb10001d3a1f8c62b00132cfec7c54;hp=0e85e5ff3a0e1b277c6a5eb15487ac4c13ed6225;hpb=e54d5448174c3f61ed828ce7146a497948290a8d;p=libdcp.git

diff --git a/cscript b/cscript
index 0e85e5ff..2682439e 100644
--- a/cscript
+++ b/cscript
@@ -34,29 +34,23 @@
 import os
 import shutil
 
+option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' }
+
 def dependencies(target, options):
-    if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'):
-        return (('libcxml', 'be5d6b5'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', '6648afc'))
+    libcxml = ('libcxml', 'c333199', {'force-cpp11': options['force-cpp11']})
+    if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
+        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
     else:
-        return (('libcxml', 'be5d6b5'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
+        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
 
 def build(target, options):
-    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
-    if options is not None and 'jpeg' in options:
-        cmd += ' --jpeg=%s' % options['jpeg']
+    cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
+    cmd += ' --jpeg=%s' % options['jpeg']
     if target.platform == 'linux':
         cmd += ' --static'
-        if target.distro == 'centos':
+        if not (target.distro == 'ubuntu' and target.version == '18.04'):
+            # We only build tests on Ubuntu 18.04
             cmd += ' --disable-tests'
-            if target.version == '7':
-                # Centos 7 ships with glibmm 2.50.0 which requires C++11
-                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-                # I worry that this will cause ABI problems but I don't have
-                # a better solution.
-                cmd += ' --force-cpp11'
-        if target.distro == 'mageia' and target.version == '6':
-            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
-            cmd += ' --force-cpp11'
     elif target.platform == 'windows':
         cmd += ' --target-windows --disable-gcov --disable-tests'
         if target.version == 'xp':
@@ -68,6 +62,20 @@ def build(target, options):
     if target.debug:
         cmd += ' --enable-debug'
 
+    # Centos 7 ships with glibmm 2.50.0 which requires C++11
+    # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+    # I worry that this will cause ABI problems but I don't have
+    # a better solution.  Mageia 6 pulls the same stunt except it's
+    # libxml++ that requires C++11
+    force_cpp11 = False
+    if target.platform == 'linux':
+        if target.distro == 'centos' and target.version == '7':
+            force_cpp11 = True
+        if target.distro == 'mageia' and target.version == '6':
+            force_cpp11 = True
+    if force_cpp11 or options['force-cpp11']:
+        cmd += ' --force-cpp11'
+
     target.command(cmd)
     target.command('./waf build install')
 
@@ -75,7 +83,7 @@ def package(target, version):
     if target.platform == 'windows':
         d = 'build/libdcp-%s' % version
         os.mkdir(d)
-        for f in ['asdcp-cth.dll', 'cxml-0.dll', 'dcp-1.0.dll', 'kumu-cth.dll', 'libopenjp2.dll', 'dcpinfo.exe']:
+        for f in ['asdcp-carl.dll', 'cxml-0.dll', 'dcp-1.0.dll', 'kumu-carl.dll', 'libopenjp2.dll', 'dcpinfo.exe']:
             shutil.copyfile('%s/bin/%s' % (target.directory, f), os.path.join(d, f))
 
         if target.bits == 32: