Add minimal player HTTP server (#2830).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index d789c713cd2c55dfc423baa313c27351c0d6818d..baece29e1b2f458bf12ef1ed61c82052a8403352 100644 (file)
--- a/cscript
+++ b/cscript
@@ -533,8 +533,8 @@ def make_spec(filename, version, target, options, requires=None):
     print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
 def dependencies(target, options):
-    deps = [('libdcp', '9b9af8a80860210c6a29446f7a24795eeda9e7bc', {'c++17': target.platform == 'osx'})]
-    deps.append(('libsub', 'v1.6.47'))
+    deps = [('libdcp', 'v1.9.9', {'c++17': target.platform == 'osx'})]
+    deps.append(('libsub', 'v1.6.49'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -554,7 +554,7 @@ 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 in ['18.04', '22.04']) or
+            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04', '24.04']) or
             (target.platform == 'osx') or
             (target.platform == 'windows')
         ):
@@ -721,6 +721,7 @@ def package_windows(target):
     shutil.copyfile('build/platform/windows/installer.%s.nsi' % identifier, 'build/platform/windows/installer2.%s.nsi' % identifier)
     target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
+    target.command('sed -i "s~%%web%%~%s/web~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier))
     target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier))
     target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier))
@@ -745,12 +746,12 @@ def package_debian(target, cpu, version, options):
 
     os.makedirs('build/deb')
     os.chdir('build/deb')
-    shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_{version}.orig.tar.bz2')
-    target.command(f'tar xjf {name}_{version}.orig.tar.bz2')
+    shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_1+{version}.orig.tar.bz2')
+    target.command(f'tar xjf {name}_1+{version}.orig.tar.bz2')
     os.chdir(f'dcpomatic-{version}')
 
     with open('debian/changelog', 'w') as f:
-        print(f'{name} ({version}-1) unstable; urgency=medium', file=f)
+        print(f'{name} (1+{version}-1) unstable; urgency=medium', file=f)
         print('', file=f)
         print('  * New upstream release.', file=f)
         print('', file=f)
@@ -935,7 +936,11 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests --check --log_level=test_suite '
+        cmd = 'run/tests '
+    if target.environment_prefix:
+        cmd += '-e %s ' % target.environment_prefix
+    if target.platform != 'windows':
+        cmd += ' --check --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None: