Only check test private data if --check is passed.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6cb19914df77addccdc0f67c7ae464ab40aef45c..ddb3a807d3125164c788a5b722a88b7a1a44e6eb 100644 (file)
--- a/cscript
+++ b/cscript
@@ -354,6 +354,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
     print('%{_bindir}/dcpomatic2_verify', file=f)
+    print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)
     if can_build_disk(target):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
@@ -368,11 +369,16 @@ def make_spec(filename, version, target, options, requires=None):
     if can_build_disk(target):
         print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
-    print('%{_datadir}/dcpomatic2/select.png', file=f)
-    print('%{_datadir}/dcpomatic2/sequence.png', file=f)
-    print('%{_datadir}/dcpomatic2/snap.png', file=f)
-    print('%{_datadir}/dcpomatic2/zoom.png', file=f)
-    print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
+    print('%{_datadir}/dcpomatic2/select_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/select_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all_black.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)
@@ -419,6 +425,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)
+    print('/bin/mv %s/bin/dcpkdm %%{buildroot}/usr/bin/dcpomatic2_kdm_inspect' % target.directory, file=f)
     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
@@ -446,8 +453,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.29'))
-    deps.append(('libsub', 'v1.6.32'))
+    deps.append(('libdcp', 'v1.8.33'))
+    deps.append(('libsub', 'v1.6.39'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -467,11 +474,11 @@ def configure_options(target, options, for_package=False):
     opt = ' --warnings-are-errors'
 
     if for_package or not (
-            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04']) or
             (target.platform == 'osx') or
             (target.platform == 'windows')
         ):
-        # Currently we only build tests on Ubuntu 18.04, macOS and Windows
+        # Currently we only build tests on macOS, Windows, and some Ubuntu versions
         opt += ' --disable-tests'
 
     if target.debug:
@@ -718,6 +725,7 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
     target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
     target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
+    target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')
     target.command(f'mkdir -p {appdir}/usr/share/libdcp')
     target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
     target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
@@ -850,7 +858,7 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests --log_level=test_suite '
+        cmd = 'run/tests --check --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None: