X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=52d7e914d4889f4c43a009cb185d4259242d8184;hb=HEAD;hp=32bd74ca42298355c83a589094cad774062885ff;hpb=37ad31ba9f10debd6eefd3c62b4cdae97a7d5218;p=libdcp.git

diff --git a/cscript b/cscript
index 32bd74ca..618b2fb9 100644
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -32,28 +32,20 @@
 #
 
 import os
+import shutil
 
-def dependencies(target):
-    if target.platform == 'windows' and target.version == 'xp':
-        return (('libcxml', 'v0.15.4'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', '213c9f8'))
-    else:
-        return (('libcxml', 'v0.15.4'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '213c9f8'))
+def dependencies(target, options):
+    return (('libcxml', 'v0.17.6'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
 
 def build(target, options):
-    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
+    cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
     if target.platform == 'linux':
         cmd += ' --static'
-        if target.distro == 'centos':
+        if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
+            # We only build tests on Ubuntu 16.04 and 22.04
             cmd += ' --disable-tests'
-        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
     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'
@@ -61,15 +53,37 @@ def build(target, options):
     target.command(cmd)
     target.command('./waf build install')
 
+def package(target, version):
+    if target.platform == 'windows':
+        d = 'build/libdcp-%s' % version
+        os.mkdir(d)
+        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:
+            shutil.copyfile('%s/bin/libgcc_s_sjlj-1.dll' % target.windows_prefix, os.path.join(d, 'libgcc_s_sjlj-1.dll'))
+        else:
+            shutil.copyfile('%s/bin/libgcc_s_seh-1.dll' % target.windows_prefix, os.path.join(d, 'libgcc_s_seh-1.dll'))
+
+        for f in ['libstdc++-6.dll', 'libboost_filesystem-mt.dll', 'libboost_system-mt.dll', 'libeay32.dll', 'libglibmm-2.4-1.dll', 'libxml++-2.6-2.dll',
+                  'libxml2-2.dll', 'libxmlsec1-openssl.dll', 'libxmlsec1.dll', 'zlib1.dll', 'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll', 'libgobject-2.0-0.dll',
+                  'libsigc-2.0-0.dll', 'libiconv-2.dll', 'liblzma-5.dll', 'libxslt-1.dll', 'libintl-8.dll', 'libpcre-1.dll', 'libffi-6.dll']:
+            shutil.copyfile('%s/bin/%s' % (target.windows_prefix, f), os.path.join(d, f))
+        zip = 'libdcp-%s-windows-%d.zip' % (version, target.bits)
+        target.command('cd build && zip -9 -r %s libdcp-%s' % (zip, version))
+        return os.path.abspath('build/%s' % zip)
+
 def make_doxygen(target):
     os.makedirs('build/doc')
     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 target.environment_prefix:
+        cmd += '-e %s' % target.environment_prefix
+    if test is not None:
+        cmd += '-t %s' % test
+    target.command(cmd)
+