fixup! Try adding --xml option to run/tests.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index dc7864cc343b020d39c9f3cb822b3089585538a2..1e47b9dc7c1836ebf034f4cc8d7eb16a75e95dac 100644 (file)
--- a/cscript
+++ b/cscript
@@ -365,7 +365,7 @@ def dependencies(target, options):
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
     elif target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', '7427ffe', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
@@ -375,8 +375,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', '4e885dc', cpp_lib_options))
-    deps.append(('libsub', 'ef8f8ac', cpp_lib_options))
+    deps.append(('libdcp', 'a8d652b', cpp_lib_options))
+    deps.append(('libsub', 'bb87e0e', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
@@ -389,7 +389,7 @@ def dependencies(target, options):
 
     return deps
 
-option_defaults = { "gui": True, "variant": None }
+option_defaults = { "gui": True, "variant": None, "xml": False }
 
 def configure_options(target, options):
     opt = ''
@@ -550,9 +550,7 @@ def build(target, options):
     else:
         target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
         target.command('./waf')
-
-        if target.platform == 'linux' or target.platform == 'osx':
-            target.command('./waf install')
+        target.command('./waf install')
 
 def package_windows(target):
     identifier = ''
@@ -721,10 +719,12 @@ def make_manual(target):
     target.command('pdflatex colour.tex')
     return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]
 
-def test(target, test):
+def test(target, options, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        cmd = 'run/tests '
+        cmd = 'run/tests'
+        if options['xml']:
+            target += '--xml '
         if target.debug:
             cmd += '--backtrace '
         if test is not None: