X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=dc145f0b618e52e57a31dfa9835311c94e015928;hb=f028e8a214ba2f6c10550c961bd13d20ddb1ffcc;hp=784e1c7f0d71f7dd82f95f19c2f88c258450ff8b;hpb=2e93ca3670e5581b5523f60130b38594de10d6c3;p=libdcp.git

diff --git a/cscript b/cscript
index 784e1c7f..dc145f0b 100644
--- a/cscript
+++ b/cscript
@@ -1,16 +1,20 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', '27780878701f85ad597addacd541f2e897719978'), ('openjpeg-cdist', '13b69c2'))
+    return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.1'))
 
 def build(target, options):
-    cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
+    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
     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')
     elif target.platform == 'windows':
-        cmd += ' --target-windows'
+        cmd += ' --target-windows --disable-gcov'
     elif target.platform == 'osx':
-        cmd += ' --osx'
+        cmd += ' --disable-tests'
 
     if target.debug:
         cmd += ' --enable-debug'
@@ -22,3 +26,8 @@ def make_doxygen(target):
     os.makedirs('build/doc')
     target.command('doxygen')
     return os.path.abspath('build/doc/html')
+
+def test(target):
+    if target.platform != 'windows':
+        target.set('LC_ALL', 'C')
+        target.command('run/tests')