X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=46438b0c424da40393341d8f21cf83f8d6a2b715;hb=4c1a8e66f754d26e3db9c4c651e19ff4b6a94bb9;hp=33e804a3c407891b3fc444357260b4eedc2f7ecc;hpb=2b32ff2aea16ad128f2e883d8b44f4249ad5da0b;p=libdcp.git

diff --git a/cscript b/cscript
index 33e804a3..46438b0c 100644
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -32,23 +32,32 @@
 #
 
 import os
+import shutil
 
 def dependencies(target, options):
-    if (target.platform == 'windows' and target.version == 'xp') or ('jpeg' in options and options['jpeg'] == 'oj1'):
-        return (('libcxml', '25e945f'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', 'f3b0fb8'))
+    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', 'carl'))
     else:
-        return (('libcxml', '25e945f'), ('openjpeg2-cdist', '8ea62cc'), ('asdcplib-cth', 'f3b0fb8'))
+        return (('libcxml', '0d18df4'), ('openjpeg', '956af06'), ('asdcplib', 'carl'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
-    if 'jpeg' in options:
+    if options is not None and 'jpeg' in options:
         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.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
+        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':
@@ -63,6 +72,26 @@ 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')