Fix indentation in cscript.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 6baddbb3c6b77c3cb492d557f738bbf4315c9ad6..ba2a6824776a91e1dce924a0f7d47ed8e71df8c3 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,14 +1,27 @@
 import os
 
 def dependencies(target):
-    return ('libcxml', '7b4ecc3')
+    return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', 'a8d8cba'), ('libdcp', '0c70427'))
 
 def build(target, options):
-    cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
+    cmd = './waf configure --prefix=%s' % target.directory
     if target.platform == 'linux':
         cmd += ' --static'
+        if target.distro == 'centos':
+            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 == 'mageia' and target.version == '6':
+            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
+            cmd += ' --force-cpp11'
     if target.debug:
         cmd += ' --enable-debug'
+    if target.platform == 'windows':
+        cmd += ' --target-windows --disable-tests'
 
     target.command(cmd)
     target.command('./waf build install')
@@ -17,3 +30,11 @@ 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)