X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=90480a34398ad40220e15ca0f6f0751416957ac7;hp=a17152d07da68d35b447d7ed6e7b893e2bb92f87;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=599d1c3c08ff1c901e1cf9194ba82a1ed0ad6797 diff --git a/cscript b/cscript index a17152d07..90480a343 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2020 Carl Hetherington +# Copyright (C) 2012-2022 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -27,15 +27,22 @@ 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_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']: +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']) + 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']) + 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() @@ -51,7 +58,6 @@ 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', @@ -68,7 +74,6 @@ 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', @@ -96,15 +101,15 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0', 'libxerces-c3.2', 'libnanomsg5']) -deb_depends['20.10'] = copy.deepcopy(deb_depends_base) -deb_depends['20.10'].extend(['libboost-filesystem1.71.0', - 'libboost-thread1.71.0', - 'libboost-regex1.71.0', - 'libboost-date-time1.71.0', +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', - 'libzip5', + 'libzip4', 'libicu67', 'libnettle8', 'libssh-4', @@ -112,10 +117,11 @@ deb_depends['20.10'].extend(['libboost-filesystem1.71.0', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg5']) + 'libnanomsg5', + 'libdav1d4']) -deb_depends['21.04'] = copy.deepcopy(deb_depends_base) -deb_depends['21.04'].extend(['libboost-filesystem1.74.0', +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', @@ -123,15 +129,15 @@ deb_depends['21.04'].extend(['libboost-filesystem1.74.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip4', - 'libicu67', + 'libicu70', 'libnettle8', 'libssh-4', - 'libx264-160', + 'libx264-163', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg5']) - + 'libnanomsg5', + 'libdav1d5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -151,8 +157,7 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libcurl3', 'libxerces-c3.1']) -deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', - 'libxcb-xfixes0', +deb_depends_gui['9'] = [ 'libxcb-xfixes0', 'libxcb-shape0', 'libasound2', 'libpulse0' ] @@ -176,8 +181,31 @@ deb_depends['10'].extend(['libboost-filesystem1.67.0', 'libxerces-c3.2', 'libnanomsg5']) -deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', - 'libxcb-xfixes0', +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' ] @@ -194,7 +222,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.67.0', 'libnettle6', 'libx264-155', 'libcurl4', - 'libxerces-c3.2']) + '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 @@ -208,15 +237,17 @@ def can_build_disk(target): if target.platform == 'osx': return True if target.platform == 'linux': - if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']: + if target.distro == 'ubuntu' and target.version != '16.04': return True - if target.distro == 'debian' and target.version == '10': + 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 == '8': + if target.distro == 'centos' and target.version != '7': + return True + if target.distro == 'mageia': return True return False @@ -236,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: @@ -252,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: @@ -269,7 +305,6 @@ def make_control(debian_version, bits, filename, debug, gui): def make_spec(filename, version, target, options, requires=None): """Make a .spec file for a RPM build""" - tools = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(filename))), "src/tools") f = open(filename, 'w') print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f) print('Name:dcpomatic2', file=f) @@ -290,6 +325,7 @@ 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) @@ -299,17 +335,18 @@ 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) - if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + if can_build_disk(target): print('%{_bindir}/dcpomatic2_disk', file=f) - print('%{_bindir}/dcpomatic2_disk_writer', 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 os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + 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) @@ -328,6 +365,7 @@ 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) @@ -341,6 +379,7 @@ def make_spec(filename, version, target, options, requires=None): 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) @@ -350,7 +389,7 @@ def make_spec(filename, version, target, options, requires=None): 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 --destdir=/usr %s' % - (target.directory, target.directory, configure_options(target, options)), file=f) + (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) @@ -359,10 +398,12 @@ def make_spec(filename, version, target, options, requires=None): 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) @@ -381,14 +422,14 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)] + deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'b68a460')) - deps.append(('libsub', '9c530ee')) - deps.append(('leqm-nrt', '131f971')) + 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. @@ -396,26 +437,28 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', '9d20ec5')) - deps.append(('ffcmp', '6259cd4')) + deps.append(('lwext4', 'cce3730')) + deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) return deps option_defaults = { "gui": True, "variant": None } -def configure_options(target, options): +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 + 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')): + (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': @@ -442,7 +485,7 @@ def configure_options(target, options): return opt -def build(target, options): +def build(target, options, for_package): if target.platform == 'flatpak': target.checkout_dependencies() prefix = 'https://dcpomatic.com/deps' @@ -557,8 +600,8 @@ 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') target.command('./waf install') @@ -580,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') @@ -597,9 +646,10 @@ def package_debian(target, cpu, version, options): 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') + 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') @@ -625,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 = [] @@ -644,35 +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)) - target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) - target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename)) - target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) - target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename)) - target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) - target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) + 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('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions' % nice_filename) - target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename)) + 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('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: + with open(f'{appdir}/AppRun', 'w') as f: print('#!/bin/bash', 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""" @@ -687,8 +754,8 @@ 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)) 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: @@ -701,7 +768,8 @@ 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 %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) + 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) @@ -717,6 +785,10 @@ def package(target, version, options): 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 @@ -746,8 +818,8 @@ 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')]