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

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 7e75cb8d2a6b995a025caf296eed5f2c82025f92..1e47b9dc7c1836ebf034f4cc8d7eb16a75e95dac 100644 (file)
--- a/cscript
+++ b/cscript
@@ -309,6 +309,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
     print('%{_datadir}/dcpomatic2/tick.png', file=f)
     print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
+    print('%{_datadir}/dcpomatic2/link.png', file=f)
     print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
@@ -321,6 +322,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f)
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
               'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'ko_KR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
@@ -363,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', '20d3ddf', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
@@ -373,8 +375,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', None, cpp_lib_options))
-    deps.append(('libsub', None, 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
@@ -383,11 +385,11 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', 'carl'))
     if can_build_disk(target):
-        deps.append(('lwext4', 'carl2'))
+        deps.append(('lwext4', '370b3de6'))
 
     return deps
 
-option_defaults = { "gui": True, "variant": None }
+option_defaults = { "gui": True, "variant": None, "xml": False }
 
 def configure_options(target, options):
     opt = ''
@@ -548,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 = ''
@@ -670,6 +670,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
             out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
             out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
+            out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version))
             return out
         else:
             if target.bits == 32:
@@ -718,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: