Missing install of a header.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index e283fb344eeb70d54ecc0f63dd2b321909d7fea1..d566a971b81500518176ae268c59cc7b95059b2e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -39,9 +39,9 @@ option_defaults = { 'jpeg': 'oj2' }
 def dependencies(target, options):
     libcxml = ('libcxml', 'v0.17.3')
     if options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
+        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'ee04871698c10aa4d9736d3457bf74ff68a07b5d'))
     else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
+        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'ee04871698c10aa4d9736d3457bf74ff68a07b5d'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
@@ -52,7 +52,7 @@ def build(target, options):
             # We only build tests on Ubuntu 18.04
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
-        cmd += f' --target-windows-{target.bits} --disable-gcov --disable-tests'
+        cmd += f' --target-windows-{target.bits}'
         if target.version == 'xp':
             # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
             cmd += ' --jpeg=oj1'
@@ -88,10 +88,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)
+