Use boost::optional for key id instead of an empty string.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index 3510f70921f955d17adfae603979ecfb8361d8a1..1a8113a1fd1f055b3f40df523aa889089591932e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,17 +1,31 @@
+import os
 
-def build(env, target):
-    cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
+def dependencies(target):
+    return (('libcxml', 'f35787e'), ('openjpeg-cdist', '5d8bffd'))
+
+def build(target, options):
+    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
     if target.platform == 'linux':
-        cmd += ' --static-libdcp --static-openjpeg'
+        cmd += ' --static'
+        if target.distro == 'centos':
+            cmd += ' --disable-tests'
     elif target.platform == 'windows':
-        cmd += ' --target-windows'
-    env.command(cmd)
-    env.command('./waf build install')
+        cmd += ' --target-windows --disable-tests'
+    elif target.platform == 'osx':
+        cmd += ' --disable-tests'
+
+    if target.debug:
+        cmd += ' --enable-debug'
 
-def make_doxygen(env):
-    env.command('doxygen')
-    try:
-        os.makedirs('build/doc')
-    except:
-        pass
+    target.command(cmd)
+    target.command('./waf build install')
+
+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')