X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d566a971b81500518176ae268c59cc7b95059b2e;hb=872000f46a36849433219c0a20b11262f9f9a031;hp=dae220eda5088ce5a4d5a94d412c7705284aacad;hpb=e8b480e299938dbb74becf290c1e9befbf3765b1;p=libdcp.git

diff --git a/cscript b/cscript
index dae220ed..d566a971 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,36 +34,28 @@
 import os
 import shutil
 
+option_defaults = { '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', '2671859'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', '6648afc'))
+    libcxml = ('libcxml', 'v0.17.3')
+    if options['jpeg'] == 'oj1':
+        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'ee04871698c10aa4d9736d3457bf74ff68a07b5d'))
     else:
-        return (('libcxml', '2671859'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
+        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'ee04871698c10aa4d9736d3457bf74ff68a07b5d'))
 
 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'
+        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'
-    elif target.platform == 'osx':
-        cmd += ' --disable-tests'
 
     if target.debug:
         cmd += ' --enable-debug'
@@ -75,7 +67,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:
@@ -96,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)
+