Fill test disk partitions with random noise to expose more bugs.
[dcpomatic.git] / cscript
diff --git a/cscript b/cscript
index f8fc6ed182309574a5e5d6766dd515996dd66b7d..90480a34398ad40220e15ca0f6f0751416957ac7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -27,46 +27,28 @@ import json
 
 deb_build_depends = dict()
 
-deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
-
-deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['14.04'].extend(['libssh-dev'])
-deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['16.04'].extend(['libssh-dev'])
-deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['17.10'].extend(['libssh-dev'])
-deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['18.04'].extend(['libssh-dev'])
-deb_build_depends['18.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['18.10'].extend(['libssh-dev'])
-deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['7'].extend(['libssh-dev'])
-deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['8'].extend(['libssh-gcrypt-dev'])
-deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
+deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
+
+for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python'])
+for v in ['22.04']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
+for v in ['9', '10']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
+for v in ['11']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['unstable'].extend(['python3'])
 
 deb_depends = dict()
 deb_depends_gui = dict()
 
 deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0']
 
-deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
-                             'libboost-thread1.54.0',
-                             'libboost-regex1.54.0',
-                             'libxml++2.6-2',
-                             'libboost-date-time1.54.0',
-                             'libzip2',
-                             'libcairomm-1.0-1',
-                             'libpangomm-1.4-1,'
-                             'libicu52',
-                             'libnettle4',
-                             'libssh-4',
-                             'libx264-142',
-                             'libcurl3'])
-
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libboost-thread1.58.0',
@@ -76,26 +58,12 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libzip4',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
-                             'libwxgtk3.0-0v5',
                              'libicu55',
                              'libnettle6',
                              'libssh-4',
                              'libx264-148',
-                             'libcurl3'])
-
-deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
-                             'libboost-thread1.62.0',
-                             'libboost-regex1.62.0',
-                             'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
-                             'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu57',
-                             'libnettle6',
-                             'libssh-4',
-                             'libx264-148',
-                             'libcurl3'])
+                             'libcurl3',
+                             'libxerces-c3.1'])
 
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
@@ -106,61 +74,70 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip4',
-                             'libwxgtk3.0-0v5',
                              'libicu60',
                              'libnettle6',
                              'libssh-4',
                              'libx264-152',
-                             'libcurl4'])
-
-deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
-                             'libboost-thread1.65.1',
-                             'libboost-regex1.65.1',
-                             'libboost-date-time1.65.1',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
+
+deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
+                             'libboost-thread1.71.0',
+                             'libboost-regex1.71.0',
+                             'libboost-date-time1.71.0',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
+                             'libxml++2.6-2v5',
+                             'libzip5',
+                             'libicu66',
+                             'libnettle7',
+                             'libssh-4',
+                             'libx264-155',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5'])
+
+deb_depends['21.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
+                             'libboost-thread1.74.0',
+                             'libboost-regex1.74.0',
+                             'libboost-date-time1.74.0',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu60',
-                             'libnettle6',
+                             'libicu67',
+                             'libnettle8',
                              'libssh-4',
-                             'libx264-152',
-                             'libcurl4'])
-
-deb_depends['7'] = copy.deepcopy(deb_depends_base)
-deb_depends['7'].extend(['libboost-filesystem1.49.0',
-                         'libboost-thread1.49.0',
-                         'libboost-regex1.49.0',
-                         'libxml++2.6-2',
-                         'libboost-date-time1.49.0',
-                         'libzip2',
-                         'libcairomm-1.0-1',
-                         'libpangomm-1.4-1',
-                         'libicu48',
-                         'libnettle4',
-                         'libnotify4',
-                         'libx264-123',
-                         'libcurl3'])
-
-deb_depends['8'] = copy.deepcopy(deb_depends_base)
-deb_depends['8'].extend(['libboost-filesystem1.55.0',
-                         'libboost-thread1.55.0',
-                         'libboost-date-time1.55.0',
-                         'libboost-regex1.55.0',
-                         'libxml++2.6-2',
-                         'libzip2',
-                         'libcairomm-1.0-1',
-                         'libpangomm-1.4-1',
-                         'libwxgtk3.0-0',
-                         'libxcb-xfixes0',
-                         'libxcb-shape0',
-                         'libicu52',
-                         'libnettle4',
-                         'libssh-4',
-                         'libx264-142',
-                         'libcurl3'])
+                             'libx264-160',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5',
+                             'libdav1d4'])
+
+deb_depends['22.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.04'].extend(['libboost-filesystem1.74.0',
+                             'libboost-thread1.74.0',
+                             'libboost-regex1.74.0',
+                             'libboost-date-time1.74.0',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
+                             'libxml++2.6-2v5',
+                             'libzip4',
+                             'libicu70',
+                             'libnettle8',
+                             'libssh-4',
+                             'libx264-163',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5',
+                             'libdav1d5'])
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -177,26 +154,102 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libssh-gcrypt-4',
                          'libnettle6',
                          'libx264-148',
-                         'libcurl3'])
+                         'libcurl3',
+                         'libxerces-c3.1'])
 
-deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
-                         'libxcb-xfixes0',
+deb_depends_gui['9'] = [ 'libxcb-xfixes0',
                          'libxcb-shape0',
                          'libasound2',
                          'libpulse0' ]
 
+deb_depends['10'] = copy.deepcopy(deb_depends_base)
+deb_depends['10'].extend(['libboost-filesystem1.67.0',
+                          'libboost-thread1.67.0',
+                          'libboost-regex1.67.0',
+                          'libboost-date-time1.67.0',
+                          'libxml++2.6-2v5',
+                          'libgtk2.0-0',
+                          'libzip4',
+                          'libcairomm-1.0-1v5',
+                          'libpangomm-1.4-1v5',
+                          'libicu63',
+                          'libssh-4',
+                          'libssh-gcrypt-4',
+                          'libnettle6',
+                          'libx264-155',
+                          'libcurl4',
+                          'libxerces-c3.2',
+                          'libnanomsg5'])
+
+deb_depends_gui['10'] = [ 'libxcb-xfixes0',
+                          'libxcb-shape0',
+                          'libasound2',
+                          'libpulse0' ]
+
+deb_depends['11'] = copy.deepcopy(deb_depends_base)
+deb_depends['11'].extend(['libboost-filesystem1.74.0',
+                          'libboost-thread1.74.0',
+                          'libboost-regex1.74.0',
+                          'libboost-date-time1.74.0',
+                          'libxml++2.6-2v5',
+                          'libzip4',
+                          'libcairomm-1.0-1v5',
+                          'libpangomm-1.4-1v5',
+                          'libicu67',
+                          'libssh-4',
+                          'libssh-gcrypt-4',
+                          'libnettle8',
+                          'libx264-160',
+                          'libcurl4',
+                          'libxerces-c3.2',
+                          'libnanomsg5',
+                          'libdav1d4'])
+
+deb_depends_gui['11'] = [ 'libxcb-xfixes0',
+                          'libxcb-shape0',
+                          'libasound2',
+                          'libpulse0' ]
+
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
-deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
-                                'libboost-thread1.62.0',
-                                'libboost-regex1.62.0',
-                                'libboost-date-time1.62.0',
+deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
+                                'libboost-thread1.67.0',
+                                'libboost-regex1.67.0',
+                                'libboost-date-time1.67.0',
                                 'libxml++2.6-2v5',
                                 'libgtk2.0-0',
                                 'libzip4',
-                                'libicu57',
+                                'libicu63',
                                 'libnettle6',
-                                'libx264-148',
-                                'libcurl3'])
+                                'libx264-155',
+                                'libcurl4',
+                                'libxerces-c3.2',
+                                'libdav1d4'])
+
+def can_build_disk(target):
+    # We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4
+    # library.  For now, just whitelist good ones here.
+    #
+    # - Lots of Linux distros (including Ubuntu 16.04) don't have a new enough boost (1.64 or above)
+    # - On Centos 6 we can't build lwext4 because it needs a new CMake which Centos 6's g++ is not new enough to build.
+    # - On Centos 7 there is a build error in lwext4 related to __unused
+    if target.platform == 'windows':
+        return True
+    if target.platform == 'osx':
+        return True
+    if target.platform == 'linux':
+        if target.distro == 'ubuntu' and target.version != '16.04':
+            return True
+        if target.distro == 'debian' and target.version != '9':
+            return True
+        if target.detail == 'appimage':
+            return True 
+        if target.distro == 'fedora' and int(target.version) >= 31:
+            return True
+        if target.distro == 'centos' and target.version != '7':
+            return True
+        if target.distro == 'mageia':
+            return True
+    return False
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -214,7 +267,10 @@ def make_control(debian_version, bits, filename, debug, gui):
     print('Standards-Version: 3.9.3', file=f)
     print('Homepage: https://dcpomatic.com/', file=f)
     print('', file=f)
-    print('Package: dcpomatic', file=f)
+    suffix = '' if gui else '-cli'
+    print(f'Package: dcpomatic{suffix}', file=f)
+    if gui:
+        print('Replaces: dcpomatic-cli', file=f)
     if bits == 32:
         print('Architecture: i386', file=f)
     else:
@@ -230,10 +286,12 @@ def make_control(debian_version, bits, filename, debug, gui):
     print('  DCP-o-matic generates Digital Cinema Packages (DCPs) from videos, images,', file=f)
     print('  sound and subtitle files.  You can use it to make content for playback on DCI-compliant', file=f)
     print('  cinema projectors.', file=f)
+    if not gui:
+        print('  This package contains the command-line tools only.', file=f)
 
     if debug:
         print('', file=f)
-        print('Package: dcpomatic-dbg', file=f)
+        print(f'Package: dcpomatic{suffix}-dbg', file=f)
         if bits == 32:
             print('Architecture: i386', file=f)
         else:
@@ -267,17 +325,29 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_batch', file=f)
     print('%{_bindir}/dcpomatic2_cli', file=f)
     print('%{_bindir}/dcpomatic2_create', file=f)
+    print('%{_bindir}/dcpomatic2_editor', file=f)
     print('%{_bindir}/dcpomatic2_kdm', file=f)
     print('%{_bindir}/dcpomatic2_server', file=f)
     print('%{_bindir}/dcpomatic2_server_cli', file=f)
     print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
     print('%{_bindir}/dcpomatic2_player', file=f)
+    print('%{_bindir}/dcpomatic2_playlist', file=f)
+    print('%{_bindir}/dcpomatic2_openssl', file=f)
+    print('%{_bindir}/dcpomatic2_combiner', file=f)
+    print('%{_bindir}/dcpomatic2_verify', 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)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_editor.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_combiner.desktop', file=f)
+    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)
@@ -286,6 +356,8 @@ 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)
     print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
@@ -293,14 +365,22 @@ def make_spec(filename, version, target, options, requires=None):
     for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         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)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.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', 'ar_LB', 'fi_FI', 'el_GR', 'tr_TR']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
+    print('%{_datadir}/libdcp/tags/*', file=f)
+    print('%{_datadir}/libdcp/xsd/*', file=f)
+    print('%{_datadir}/libdcp/ratings', file=f)
+    print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f)
     print('', file=f)
     print('%prep', file=f)
     print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f)
@@ -308,16 +388,22 @@ def make_spec(filename, version, target, options, requires=None):
     print('%build', file=f)
     print('cd dcpomatic-%s' % version, file=f)
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f)
-
-    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' %
-          (target.directory, target.directory, configure_options(target, options)), file=f)
+    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --destdir=/usr %s' %
+          (target.directory, target.directory, configure_options(target, options, for_package=True)), file=f)
     print('./waf', file=f)
     print('%install', file=f)
     print('cd dcpomatic-%s' % version, file=f)
     print('./waf install', file=f)
+    print('/bin/cp %s/src/openssl/apps/openssl %%{buildroot}/usr/bin/dcpomatic2_openssl' % target.directory, file=f)
+    print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
+    print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
+    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('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f)
     print('', file=f)
     print('%postun', file=f)
     print('if [ $1 -eq 0 ] ; then', file=f)
@@ -328,41 +414,51 @@ def make_spec(filename, version, target, options, requires=None):
     print('%posttrans', file=f)
     print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
-def dependencies(target):
+def dependencies(target, options):
 
     if target.platform == 'linux':
         ffmpeg_options = { 'shared': False }
     else:
         ffmpeg_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', 'a820b44', ffmpeg_options)]
+    if target.platform != 'linux' or target.distro != 'arch':
+        deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '27e1378'))
-    deps.append(('libsub', '2728525'))
-    deps.append(('rtaudio-cdist', 'a227107'))
+    deps.append(('libdcp', 'v1.8.22'))
+    deps.append(('libsub', 'v1.6.23'))
+    deps.append(('leqm-nrt', '93ae9e6'))
+    deps.append(('rtaudio', 'f619b76'))
+    # We get our OpenSSL libraries from the environment, but we
+    # also need a patched openssl binary to make certificates.
+    # This dependency is to get that binary, which is added into
+    # the appropriate place later
+    deps.append(('openssl', '7f29dd5'))
+    if can_build_disk(target):
+        deps.append(('lwext4', 'cce3730'))
+    deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
 
     return deps
 
-def option_defaults():
-    return { "gui": True, "variant": None }
+option_defaults = { "gui": True, "variant": None }
 
-def configure_options(target, options):
-    opt = ''
+def configure_options(target, options, for_package=False):
+    opt = ' --warnings-are-errors'
 
-    if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
-        # Currently we only build tests on Ubuntu 1{6,8}.04
+    if for_package or 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:
         opt += ' --enable-debug'
     if target.platform == 'windows':
-        opt += ' --target-windows'
+        opt += f' --target-windows-{target.bits}'
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
@@ -370,11 +466,6 @@ def configure_options(target, options):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi'
-                # Centos 7 ships with glibmm 2.50.0 which requires C++11
-                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-                # I worry that this will cause ABI problems but I don't have
-                # a better solution.
-                opt += ' --force-cpp11'
 
     if not options['gui']:
         opt += ' --disable-gui'
@@ -386,9 +477,15 @@ def configure_options(target, options):
     if target.debug and target.platform == 'windows':
         opt += ' --static-dcpomatic'
 
+    if can_build_disk(target):
+        opt += ' --enable-disk'
+
+    if target.platform == 'osx' and target.arch == 'arm64':
+        opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
+
     return opt
 
-def build(target, options):
+def build(target, options, for_package):
     if target.platform == 'flatpak':
         target.checkout_dependencies()
         prefix = 'https://dcpomatic.com/deps'
@@ -397,7 +494,7 @@ def build(target, options):
                         'buildsystem': 'cmake',
                         'sources': [{'type': 'archive',
                                      'url': '%s/libzip-1.4.0.tar.xz' % prefix,
-                                    'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
+                                     'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
         modules.append({'name': 'libsigc++',
                         'sources': [{'type': 'archive',
                                      'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
@@ -411,87 +508,87 @@ def build(target, options):
                                      'url': '%s/cairomm-1.12.2.tar.gz' % prefix,
                                      'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]})
         modules.append({'name': 'pangomm',
-                       'sources': [{'type': 'archive',
-                                    'url': '%s/pangomm-2.40.1.tar.xz' % prefix,
-                                    'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]})
-       modules.append({'name': 'libxml++',
-                       'sources': [{'type': 'archive',
-                                    'url': '%s/libxml++-2.40.1.tar.xz' % prefix,
-                                    'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]})
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/pangomm-2.40.1.tar.xz' % prefix,
+                                     'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]})
+        modules.append({'name': 'libxml++',
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/libxml++-2.40.1.tar.xz' % prefix,
+                                     'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]})
         modules.append({'name': 'xmlsec1',
-                       'sources': [{'type': 'archive',
-                                    'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix,
-                                    'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]})
-       modules.append({'name': 'openjpeg2',
-                       'buildsystem': 'cmake',
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]})
-       modules.append({'name': 'boost',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './bootstrap.sh --prefix=/app',
-                           './b2 install'
-                       ],
-                       'sources': [{'type': 'archive',
-                                    'url': '%s/boost_1_66_0.tar.bz2' % prefix,
-                                    'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
-       modules.append({'name': 'asdcplib',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './waf configure --prefix=/app  --libdir=/app/lib build install'
-                       ],
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-cth')}]})
-       modules.append({'name': 'locked_sstream',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './waf configure --prefix=/app build install'
-                       ],
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]})
-       modules.append({'name': 'libcxml',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './waf configure --prefix=/app  --libdir=/app/lib build install'
-                       ],
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../libcxml')}]})
-       modules.append({'name': 'libdcp',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './waf configure --prefix=/app --libdir=/app/lib build install'
-                       ],
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../libdcp')}]})
-       modules.append({'name': 'libsub',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './waf configure --prefix=/app --libdir=/app/lib build install'
-                       ],
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]})
-       modules.append({'name': 'rtaudio',
-                       'build-options': {
-                           'config-opts': [
-                               '--prefix=/app',
-                               '--with-pulse',
-                               '--with-alsa'
-                           ]
-                       },
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]})
-       modules.append({'name': 'wxwidgets',
-                       'sources': [{'type': 'archive',
-                                    'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix,
-                                    'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]})
-       modules.append({'name': 'libssh',
-                       'buildsystem': 'cmake',
-                       'builddir': True,
-                       'sources': [{'type': 'archive',
-                                    'url': '%s/libssh-0.7.5.tar.xz' % prefix,
-                                    'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]})
-       modules.append({'name': 'dcpomatic',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './waf configure --prefix=/app build install'
-                       ],
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix,
+                                     'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]})
+        modules.append({'name': 'openjpeg2',
+                        'buildsystem': 'cmake',
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]})
+        modules.append({'name': 'boost',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './bootstrap.sh --prefix=/app',
+                            './b2 install'
+                        ],
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/boost_1_66_0.tar.bz2' % prefix,
+                                     'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
+        modules.append({'name': 'asdcplib',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './waf configure --prefix=/app  --libdir=/app/lib build install'
+                        ],
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-carl')}]})
+        modules.append({'name': 'locked_sstream',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './waf configure --prefix=/app build install'
+                        ],
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]})
+        modules.append({'name': 'libcxml',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './waf configure --prefix=/app  --libdir=/app/lib build install'
+                        ],
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../libcxml')}]})
+        modules.append({'name': 'libdcp',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './waf configure --prefix=/app --libdir=/app/lib build install'
+                        ],
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../libdcp')}]})
+        modules.append({'name': 'libsub',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './waf configure --prefix=/app --libdir=/app/lib build install'
+                        ],
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]})
+        modules.append({'name': 'rtaudio',
+                        'build-options': {
+                        'config-opts': [
+                            '--prefix=/app',
+                            '--with-pulse',
+                            '--with-alsa'
+                        ]
+                        },
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]})
+        modules.append({'name': 'wxwidgets',
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix,
+                                     'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]})
+        modules.append({'name': 'libssh',
+                        'buildsystem': 'cmake',
+                        'builddir': True,
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/libssh-0.7.5.tar.xz' % prefix,
+                                     'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]})
+        modules.append({'name': 'dcpomatic',
+                        'buildsystem': 'simple',
+                        'build-commands': [
+                            './waf configure --prefix=/app build install'
+                         ],
                         'build-options': {
-                            'build-args': ['--share=network']
+                           'build-args': ['--share=network']
                         },
-                       'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]})
+                        'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]})
         desc = {'app-id': 'com.dcpomatic.DCP-o-matic',
                 'runtime': 'org.gnome.Sdk',
                 'runtime-version': '3.26',
@@ -503,12 +600,10 @@ def build(target, options):
         with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
             json.dump(desc, outfile)
         target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
-    else:
-        target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
+    elif target.platform != 'linux' or target.detail == 'appimage' or not for_package:
+        target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options, for_package)))
         target.command('./waf')
-
-        if target.platform == 'linux' or target.platform == 'osx':
-            target.command('./waf install')
+        target.command('./waf install')
 
 def package_windows(target):
     identifier = ''
@@ -520,7 +615,7 @@ def package_windows(target):
     target.command('sed -i "s~%%graphics%%~%s/graphics~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.mingw_path, identifier))
+    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier))
     target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier)
     target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier)
@@ -528,9 +623,15 @@ def package_windows(target):
 
 def package_debian(target, cpu, version, options):
     make_control(target.version, target.bits, 'debian/control', target.debug, options['gui'])
+    if target.version != '9' and target.version != '16.04' and options['gui']:
+        with open('debian/postinst', 'w') as f:
+            print('#!/bin/sh', file=f)
+            # Get the required capability to write to disks
+            print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f)
     target.command('./waf dist')
     f = open('debian/files', 'w')
-    print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f)
+    suffix = '' if options['gui'] else '-cli'
+    print(f'dcpomatic{suffix}_{version}-1_{cpu}.deb video extra', file=f)
     shutil.rmtree('build/deb', ignore_errors=True)
 
     os.makedirs('build/deb')
@@ -538,18 +639,17 @@ def package_debian(target, cpu, version, options):
     shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
     target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version)
     os.chdir('dcpomatic-%s' % version)
+    target.set('EMAIL', 'carl@dcpomatic.com')
     target.command('dch -b -v %s-1 "New upstream release."' % version)
     target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS'))
     target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS'))
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
+    target.set('CDIST_DIRECTORY', target.directory)
 
-    target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"')
-    if target.debug:
-        target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version in ['7', '14.04']:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
-    else:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
+    target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
+    target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
+    if not target.debug:
+        target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
 
     target.command('dpkg-buildpackage -uc -us')
 
@@ -575,10 +675,10 @@ def package_rpm(target, cpu, version, options):
 
     requires = None
     if target.distro == 'mageia':
-        requires = "lib64xmlsec1-devel"
+        requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils"
 
-    make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
-    cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
+    make_spec('dcpomatic2.spec', version, target, options, requires)
+    cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir
     target.command(cmd)
     rpms = []
 
@@ -594,26 +694,52 @@ def package_rpm(target, cpu, version, options):
 
 def make_appimage(target, nice_name, internal_name, version):
     nice_filename = nice_name.replace(' ', '_')
-    os.makedirs('build/%s.AppDir/usr/bin' % nice_filename)
-    target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename))
-    with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f:
+    appdir = f'build/{nice_filename}.AppDir'
+    os.makedirs(f'{appdir}/usr/bin')
+    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'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/')
+    target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/')
+    target.command(f'cp {target.directory}/share/libdcp/ratings {appdir}/usr/share/libdcp/')
+    lib = 'usr/lib/x86_64-linux-gnu'
+    target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
+    target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')
+    target.command('apt update')
+    for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0']:
+        target.command(f'apt download {package}')
+        target.command(f'dpkg-deb -x {package}*.deb {appdir}')
+    target.command(f'glib-compile-schemas {appdir}/usr/share/glib-2.0/schemas')
+    target.command(f'sed -i -e "s|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-.*/.*/loaders/||g" {appdir}/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache')
+    # Stop anything loading from outside the AppImage
+    target.command(f'sed -i -e "s|/usr|/xxx|g" {appdir}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2')
+
+    if internal_name == 'dcpomatic2_disk':
+        target.command(f'mkdir -p {appdir}/usr/share/polkit-1/actions')
+        target.command(f'cp {target.directory}/share/polkit-1/actions/com.dcpomatic.write-drive.policy {appdir}/usr/share/polkit-1/actions')
+
+    with open(f'{appdir}/AppRun', 'w') as f:
         print('#!/bin/bash', file=f)
-        print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f)
         print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
         print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f)
-        print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f)
-    target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename)
-    with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f:
+        print('export GDK_PIXBUF_MODULEDIR=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/ )', file=f)
+        print('export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache )', file=f)
+        print('export LD_LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu', file=f)
+        print(f'"$APPDIR"/usr/bin/{internal_name} $@', file=f)
+    target.command(f'chmod a+rx {appdir}/AppRun')
+    with open(f'{appdir}/{internal_name}.desktop', 'w') as f:
         print('[Desktop Entry]', file=f)
         print('Type=Application', file=f)
         print('Categories=AudioVideo;', file=f)
-        print('Name=%s' % nice_name, file=f)
-        print('Icon=%s' % internal_name, file=f)
-    target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename))
-    target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename)
-    target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename)
-    target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version))
-    return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version))
+        print(f'Name={nice_name}', file=f)
+        print(f'Icon={internal_name}', file=f)
+    target.command(f'cp graphics/linux/256/{internal_name}.png {appdir}')
+    target.command(f'linuxdeploy-x86_64.AppImage --appdir {appdir}')
+    target.command(f'appimagetool-x86_64.AppImage {appdir}')
+    target.command(f'mv {nice_filename}-x86_64.AppImage build/{nice_filename}-{version}-x86_64.AppImage')
+    return os.path.abspath(f'build/{nice_filename}-{version}-x86_64.AppImage')
 
 def package(target, version, options):
     """version: DCP-o-matic version string"""
@@ -624,8 +750,12 @@ def package(target, version, options):
             out = []
             out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
             out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version))
+            out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version))
             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 Combiner', 'dcpomatic2_combiner', version))
+            out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version))
             return out
         else:
             if target.bits == 32:
@@ -638,8 +768,30 @@ def package(target, version, options):
             elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
                 return package_rpm(target, cpu, version, options)
     elif target.platform == 'osx':
-        target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
-        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
+        archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
+        target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs))
+        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"))
+            elif x.find("Combiner") != -1:
+                packages.append((a, "com.dcpomatic.combiner"))
+            elif x.find("Editor") != -1:
+                packages.append((a, "com.dcpomatic.editor"))
+            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')
@@ -666,17 +818,19 @@ def make_pot(target):
             os.path.abspath('build/src/tools/dcpomatic.pot')]
 
 def make_manual(target):
+    target.command('make -C doc/manual LIBDCP=../../../libdcp')
     os.chdir('doc/manual')
-    target.command('make')
     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 += '-t %s' % test
+    target.command(cmd)