X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2bdb9bfadfb391c9b9c0d9edc671cb6014881499;hb=2da55dbe6da21975612584365db17db2ae9935b8;hp=ba4a7e4c4802505b2b207a88b5654d41bff79143;hpb=b221efe5860ffabbca3797779a5971b5cc68175c;p=libdcp.git

diff --git a/cscript b/cscript
index ba4a7e4c..2bdb9bfa 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.
 #
@@ -34,28 +34,18 @@
 import os
 import shutil
 
-option_defaults = { 'jpeg': 'oj2' }
-
 def dependencies(target, options):
-    libcxml = ('libcxml', 'v0.17.0')
-    if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
-    else:
-        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
+    return (('libcxml', 'v0.17.5'), ('openjpeg', 'a1403c2'), ('asdcplib', 'ae75eb417d3804a6d723e2cf09647b54b15df5db'))
 
 def build(target, options):
     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'
     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'
+        cmd += f' --target-windows-{target.bits}'
 
     if target.debug:
         cmd += ' --enable-debug'
@@ -88,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)
+