X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=990ad52f3c5e8f2a4e98e92219fde3b7f3cd024a;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=80fdf5d55c39339a71f03f8e235de800d56de771;hpb=2c9b8975679db4b187fd9e7254703898e70224d0;p=dcpomatic.git

diff --git a/cscript b/cscript
index 80fdf5d55..990ad52f3 100644
--- a/cscript
+++ b/cscript
@@ -93,7 +93,6 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip5',
-                             'libwxgtk3.0-gtk3-0v5',
                              'libicu66',
                              'libnettle7',
                              'libssh-4',
@@ -112,11 +111,10 @@ deb_depends['20.10'].extend(['libboost-filesystem1.71.0',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip5',
-                             'libwxgtk3.0-gtk3-0v5',
-                             'libicu66',
-                             'libnettle7',
+                             'libicu67',
+                             'libnettle8',
                              'libssh-4',
-                             'libx264-155',
+                             'libx264-160',
                              'libcurl4',
                              'libpulse0',
                              'libxerces-c3.2',
@@ -287,9 +285,6 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_playlist', file=f)
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
-    if options['variant'] == 'swaroop-studio':
-        print('%{_bindir}/dcpomatic2_ecinema', file=f)
-        print('%{_bindir}/dcpomatic2_uuid', file=f)
     if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%{_bindir}/dcpomatic2_disk_writer', file=f)
@@ -375,8 +370,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', '41d9b6a', cpp_lib_options))
-    deps.append(('libsub', 'fd5af8c', cpp_lib_options))
+    deps.append(('libdcp', 'b636c3e', cpp_lib_options))
+    deps.append(('libsub', '6514f5b', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
@@ -386,6 +381,7 @@ def dependencies(target, options):
     deps.append(('openssl', 'carl'))
     if can_build_disk(target):
         deps.append(('lwext4', '370b3de6'))
+    deps.append(('ffcmp', None))
 
     return deps
 
@@ -394,8 +390,10 @@ option_defaults = { "gui": True, "variant": None }
 def configure_options(target, options):
     opt = ' --warnings-are-errors'
 
-    if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
-        # Currently we only build tests on Ubuntu 18.04
+    if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+            (target.platform == 'osx') or
+            (target.platform == 'windows')):
+        # Currently we only build tests on Ubuntu 18.04, macOS and Windows
         opt += ' --disable-tests'
 
     if target.debug:
@@ -687,7 +685,24 @@ def package(target, version, options):
         return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
     elif target.platform == 'osx' and target.bits == 64:
         target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
-        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
+        packages = []
+        for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
+            a = os.path.abspath(x)
+            if x.find("Player") != -1:
+                packages.append((a, "com.dcpomatic.player"))
+            elif x.find("Playlist Editor") != -1:
+                packages.append((a, "com.dcpomatic.playlist"))
+            elif x.find("KDM Creator") != -1:
+                packages.append((a, "com.dcpomatic.kdm"))
+            elif x.find("Batch Converter") != -1:
+                packages.append((a, "com.dcpomatic.batch"))
+            elif x.find("Encode Server") != -1:
+                packages.append((a, "com.dcpomatic.server"))
+            elif x.find("Disk Writer") != -1:
+                packages.append((a, "com.dcpomatic.disk"))
+            else:
+                packages.append((a, "com.dcpomatic"))
+        return packages
     elif target.platform == 'docker':
         shutil.copyfile(target.deb, 'build/platform/docker')
         f = open('build/platform/docker/Dockerfile', 'w')
@@ -719,12 +734,14 @@ 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):
-    if target.platform != 'windows':
-        target.set('LC_ALL', 'C')
+def test(target, options, test):
+    target.set('LC_ALL', 'C')
+    if target.platform == 'windows':
+        cmd = 'run\\tests'
+    else:
         cmd = 'run/tests '
-        if target.debug:
-            cmd += '--backtrace '
-        if test is not None:
-            cmd += '--run_test=%s' % test
-        target.command(cmd)
+    if target.debug:
+        cmd += '--backtrace '
+    if test is not None:
+        cmd += '--run_test=%s' % test
+    target.command(cmd)