Merge.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index c2c3b68978123c3d4ed97b631bc04b7f9e4de43a..8042b731372edddc0c9f56aa22e96b055209d1de 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,29 @@
+#
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libsub.
+#
+#    libsub 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.
+#
+#    libsub 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 libsub.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 
-def dependencies(target):
-    return (('libdcp', 'bc2b4bb'),)
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    libdcp = ('libdcp', 'e5f89bf')
+    return (('asdcplib', 'carl'), libdcp)
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,8 +31,6 @@ def build(target, options):
         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.debug:
         cmd += ' --enable-debug'
     if target.platform == 'windows':
@@ -24,7 +44,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)