Replace DCP parser with basic version that uses libdcp.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 57fba8285046f34fa18fe17e06c0da90befe44ca..6ce93191b46e6c4efb1017f6122f75d42e78753d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('libdcp', '7c96eea'),)
+    return (('asdcplib-cth', 'v0.1.3'), ('libcxml', 'v0.15.4'), ('libdcp', None))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,7 +9,7 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-        if target.distro == 'debian' and target.version == 'unstable':
+        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'
@@ -24,7 +24,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)