X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d2b0474faa8daded7e2f3a32dafe21a4eefc1392;hb=refs%2Fheads%2Fxmldiff;hp=b84ce65ededfaad91ad5bf7578eaf8b4c2bc84c6;hpb=5508855a875d94a1bd559f29febc56c8bff68f47;p=libdcp.git

diff --git a/cscript b/cscript
index b84ce65e..d2b0474f 100644
--- a/cscript
+++ b/cscript
@@ -34,41 +34,46 @@
 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', '0d18df4'), ('openjpeg', '9e80dae'), ('asdcplib', '689b546f'))
+    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', '0d18df4'), ('openjpeg', '956af06'), ('asdcplib', '689b546f'))
+        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 not (target.distro == 'ubuntu' and target.version == '18.04'):
             # We only build tests on Ubuntu 18.04
             cmd += ' --disable-tests'
-        if target.distro == 'centos' and 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':
             # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
             cmd += ' --jpeg=oj1'
-    elif target.platform == 'osx':
-        cmd += ' --disable-tests'
 
     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')