X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=01e1ef16a7a7b26993050fd249fa604780eeac31;hb=2137d41ec8256b316103449881d7bbfdbef309fb;hp=f1eaea0a4906ad62a85787b99cae331deab8cf51;hpb=18875fc4ff9f04f57b035a51f151de9920a54a6a;p=libdcp.git

diff --git a/cscript b/cscript
index f1eaea0a..01e1ef16 100644
--- a/cscript
+++ b/cscript
@@ -1,18 +1,66 @@
+#
+#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libdcp.
+#
+#    libdcp is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libdcp is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the
+#    OpenSSL library under certain conditions as described in each
+#    individual source file, and distribute linked combinations
+#    including the two.
+#
+#    You must obey the GNU General Public License in all respects
+#    for all of the code used other than OpenSSL.  If you modify
+#    file(s) with this exception, you may extend this exception to your
+#    version of the file(s), but you are not obligated to do so.  If you
+#    do not wish to do so, delete this exception statement from your
+#    version.  If you delete this exception statement from all source
+#    files in the program, then also delete it here.
+#
+
 import os
 
-def dependencies(target):
-    return (('libcxml', 'v0.15.0'), ('openjpeg2-cdist', 'e137763'))
+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', '25e945f'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', 'f3b0fb8'))
+    else:
+        return (('libcxml', '25e945f'), ('openjpeg2-cdist', '4ce711a'), ('asdcplib-cth', 'f3b0fb8'))
 
 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']
     if target.platform == 'linux':
         cmd += ' --static'
         if target.distro == 'centos':
             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.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'
+        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'
 
@@ -27,7 +75,10 @@ def make_doxygen(target):
     target.command('doxygen')
     return os.path.abspath('build/doc/html')
 
-def test(target):
+def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        target.command('run/tests')
+        if test is None:
+            target.command('run/tests')
+        else:
+            target.command('run/tests --run_test=%s' % test)