Use VerificationNote for non-fatal errors in DCP::read.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index d4903e3f4e0060e40d397d95837ad6d7b15b63a8..46438b0c424da40393341d8f21cf83f8d6a2b715 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -36,9 +36,9 @@ import shutil
 
 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', 'v0.16.0'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', '6648afc'))
+        return (('libcxml', '0d18df4'), ('openjpeg', '9e80dae'), ('asdcplib', 'carl'))
     else:
-        return (('libcxml', 'v0.16.0'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
+        return (('libcxml', '0d18df4'), ('openjpeg', '956af06'), ('asdcplib', 'carl'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -46,14 +46,15 @@ def build(target, 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.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 == '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'
@@ -75,7 +76,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: