X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=bb068ca470fe535ce6a7362c81aba36e45797cc4;hb=d305bb807a686fd7850257a724f46a77977fe491;hp=6876bf8d5a0b9e600b172358ddd406bf7cff0e0b;hpb=833ccf82dd25bd40b61a6e6f3baaf9527f3dbeb0;p=libdcp.git

diff --git a/cscript b/cscript
index 6876bf8d..bb068ca4 100644
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -35,36 +35,17 @@ import os
 import shutil
 
 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', 'd4bf40b'))
-    else:
-        return (('libcxml', '0d18df4'), ('openjpeg', '956af06'), ('asdcplib', 'd4bf40b'))
+    return (('libcxml', 'v0.17.5'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', 'ae75eb417d3804a6d723e2cf09647b54b15df5db'))
 
 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
     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'
+        cmd += f' --target-windows-{target.bits}'
 
     if target.debug:
         cmd += ' --enable-debug'
@@ -97,10 +78,10 @@ def make_doxygen(target):
     target.command('doxygen')
     return os.path.abspath('build/doc/html')
 
-def test(target, test):
-    if target.platform != 'windows':
-        target.set('LC_ALL', 'C')
-        if test is None:
-            target.command('run/tests')
-        else:
-            target.command('run/tests --run_test=%s' % test)
+def test(target, options, test):
+    target.set('LC_ALL', 'C')
+    cmd = 'run\\tests ' if target.platform == 'windows' else 'run/tests '
+    if test is not None:
+        cmd += '-t %s' % test
+    target.command(cmd)
+