X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b971ff2ea5ef806148b2b335c727ae63f751e8b3;hb=5b2e3126602d508498a99bce256f5f465f095d43;hp=222a911b52b5a78eca527e4b8dab8707b5534af3;hpb=9d843365fb77e00dd31c03d1e8ea49126ab550f2;p=dcpomatic.git diff --git a/cscript b/cscript index 222a911b5..b971ff2ea 100644 --- a/cscript +++ b/cscript @@ -19,12 +19,19 @@ # from __future__ import print_function +import datetime import glob import shutil import os import copy import json +def dmg_prefix(variant): + return 'DCP-o-matic' + +def debian_name(variant): + return 'dcpomatic' + deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] @@ -38,6 +45,9 @@ for v in ['22.04']: for v in ['23.04', '23.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.11']) +for v in ['24.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.12']) for v in ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python']) @@ -185,6 +195,30 @@ deb_depends['23.10'].extend(['libboost-filesystem1.74.0', 'libwxgtk3.2-1', 'libwxgtk-gl3.2-1']) +def debs(boost, icu, x264): + output = copy.deepcopy(deb_depends_base) + output.extend(['libboost-filesystem' + boost, + 'libboost-thread' + boost, + 'libboost-regex' + boost, + 'libboost-date-time' + boost, + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu' + icu, + 'libnettle8', + 'libssh-4', + 'libx264-' + x264, + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5', + 'libwxgtk3.2-1', + 'libwxgtk-gl3.2-1']) + return output + +deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164') + deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libboost-thread1.62.0', @@ -326,9 +360,9 @@ def packages(name, packages, f): s += str(p) + ', ' print(s[:-2], file=f) -def make_control(debian_version, bits, filename, debug, gui): +def make_control(debian_version, bits, filename, debug, gui, name): f = open(filename, 'w') - print('Source: dcpomatic', file=f) + print(f'Source: {name}', file=f) print('Section: video', file=f) print('Priority: extra', file=f) print('Maintainer: Carl Hetherington ', file=f) @@ -337,9 +371,9 @@ def make_control(debian_version, bits, filename, debug, gui): print('Homepage: https://dcpomatic.com/', file=f) print('', file=f) suffix = '' if gui else '-cli' - print(f'Package: dcpomatic{suffix}', file=f) + print(f'Package: {name}{suffix}', file=f) if gui: - print('Replaces: dcpomatic-cli', file=f) + print(f'Replaces: {name}-cli', file=f) if bits == 32: print('Architecture: i386', file=f) else: @@ -360,7 +394,7 @@ def make_control(debian_version, bits, filename, debug, gui): if debug: print('', file=f) - print(f'Package: dcpomatic{suffix}-dbg', file=f) + print(f'Package: {name}{suffix}-dbg', file=f) if bits == 32: print('Architecture: i386', file=f) else: @@ -368,8 +402,8 @@ def make_control(debian_version, bits, filename, debug, gui): print('Section: debug', file=f) print('Priority: extra', file=f) packages('Depends', pkg, f) - print('Description: debugging symbols for dcpomatic', file=f) - print(' This package contains the debugging symbols for dcpomatic.', file=f) + print(f'Description: debugging symbols for {name}', file=f) + print(f' This package contains the debugging symbols for {name}.', file=f) print('', file=f) def make_spec(filename, version, target, options, requires=None): @@ -403,7 +437,8 @@ 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) - print('%{_bindir}/dcpomatic2_verify', file=f) + print('%{_bindir}/dcpomatic2_verify_cli', file=f) + print('%{_bindir}/dcpomatic2_verifier', file=f) print('%{_bindir}/dcpomatic2_kdm_inspect', file=f) print('%{_bindir}/dcpomatic2_map', file=f) if can_build_disk(target): @@ -412,6 +447,7 @@ def make_spec(filename, version, target, options, requires=None): 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_verifier.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) @@ -430,7 +466,8 @@ def make_spec(filename, version, target, options, requires=None): 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/link.png', file=f) + print('%{_datadir}/dcpomatic2/link_black.png', file=f) + print('%{_datadir}/dcpomatic2/link_white.png', file=f) print('%{_datadir}/dcpomatic2/me.jpg', file=f) print('%{_datadir}/dcpomatic2/add_black.png', file=f) print('%{_datadir}/dcpomatic2/add_white.png', file=f) @@ -444,6 +481,7 @@ def make_spec(filename, version, target, options, requires=None): 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_verifier.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) @@ -478,7 +516,7 @@ def make_spec(filename, version, target, options, requires=None): 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('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify_cli' % 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) @@ -495,19 +533,7 @@ 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): - - if target.platform == 'linux': - ffmpeg_options = { 'shared': False } - else: - ffmpeg_options = {} - - if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)] - else: - # Use distro-provided FFmpeg on Arch - deps = [] - - deps.append(('libdcp', 'v1.8.97')) + deps = [('libdcp', 'v1.9.6', {'c++17': target.platform == 'osx'})] deps.append(('libsub', 'v1.6.47')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) @@ -518,7 +544,7 @@ def dependencies(target, options): deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e')) if can_build_disk(target): deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) - deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237')) + deps.append(('ffcmp', '5ab6ed3b75d8ca7cf1f66bb9fb08792b92f4b419')) return deps @@ -550,7 +576,7 @@ def configure_options(target, options, for_package=False): if not options['gui']: opt += ' --disable-gui' - if options['variant'] is not None: + if options['variant']: opt += ' --variant=%s' % options['variant'] # Build Windows debug versions with static linking as I think gdb works better then @@ -560,8 +586,13 @@ def configure_options(target, options, for_package=False): 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 + if target.platform == 'osx': + opt += ' --c++17' + if target.arch == 'arm64': + opt += ' --wx-config=%s/wx-config' % target.bin + + if target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['22.04']: + opt += ' --enable-grok' return opt @@ -702,7 +733,8 @@ def package_windows(target): return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) def package_debian(target, cpu, version, options): - make_control(target.version, target.bits, 'debian/control', target.debug, options['gui']) + name = debian_name(options['variant']) + make_control(target.version, target.bits, 'debian/control', target.debug, options['gui'], name) if target.version != '9' and target.version != '16.04' and options['gui']: with open('debian/postinst', 'w') as f: print('#!/bin/sh', file=f) @@ -711,24 +743,30 @@ def package_debian(target, cpu, version, options): target.command('./waf dist') f = open('debian/files', 'w') suffix = '' if options['gui'] else '-cli' - print(f'dcpomatic{suffix}_{version}-1_{cpu}.deb video extra', file=f) + print(f'{name}{suffix}_{version}-1_{cpu}.deb video extra', file=f) shutil.rmtree('build/deb', ignore_errors=True) os.makedirs('build/deb') os.chdir('build/deb') - 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) + shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_{version}.orig.tar.bz2') + target.command(f'tar xjf {name}_{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('', file=f) + print(' * New upstream release.', file=f) + print('', file=f) + print(f" -- Carl Hetherington {datetime.datetime.now().astimezone().strftime('%a, %d %b %Y %H:%M:%S %z')}", file=f) + 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, for_package=True) + '"') - target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') - target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10") else "3.1") + target.set('CDIST_PACKAGE', f'{name}{suffix}') + target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') @@ -779,7 +817,7 @@ def make_appimage(target, nice_name, internal_name, version, extra_binaries=None 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'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify_cli') target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect') if extra_binaries: for bin in extra_binaries: @@ -841,6 +879,7 @@ def package(target, version, options): 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)) + out.append(make_appimage(target, 'DCP-o-matic Verifier', 'dcpomatic2_verifier', version)) return out else: if target.bits == 32: @@ -857,8 +896,10 @@ def package(target, version, options): cmd = 'bash platform/osx/make_dmg.sh -e %s -r %s -i %s -p %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs) if 'part' in options: cmd += ' -b ' + options['part'] + if options['variant']: + cmd += ' -v ' + options['variant'] target.command(cmd) - return glob.glob('build/platform/osx/DCP-o-matic*.dmg') + return glob.glob('build/platform/osx/' + dmg_prefix(options['variant']) + '*.dmg') elif target.platform == 'docker': shutil.copyfile(target.deb, 'build/platform/docker') f = open('build/platform/docker/Dockerfile', 'w')