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

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index 6242957ac8d5a853464636c533da80c60116a48b..1a8113a1fd1f055b3f40df523aa889089591932e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', None), ('openjpeg-cdist', '5d8bffd'))
+    return (('libcxml', 'f35787e'), ('openjpeg-cdist', '5d8bffd'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -10,9 +10,9 @@ def build(target, options):
         if target.distro == 'centos':
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
-        cmd += ' --target-windows'
+        cmd += ' --target-windows --disable-tests'
     elif target.platform == 'osx':
-        cmd += ' --target-osx'
+        cmd += ' --disable-tests'
 
     if target.debug:
         cmd += ' --enable-debug'
@@ -24,3 +24,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')