X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=3d437ca5d2760f81a459e79a2404d100de25da91;hp=cbbfa02a2b9305d70d55fdcb63a2030decd8bbdc;hb=0e571479e7e19f41f2b17335d7dd4cb78141c5fb;hpb=59acc57304a545d0cad49ad204d32d3f84dbbfa2 diff --git a/cscript b/cscript index cbbfa02a2..3d437ca5d 100644 --- a/cscript +++ b/cscript @@ -33,14 +33,10 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].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['19.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['19.04'].extend(['libssh-dev']) -deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['19.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['20.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['20.04'].extend(['libssh-dev']) +deb_build_depends['20.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['20.10'].extend(['libssh-dev']) deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['9'].extend(['libssh-gcrypt-dev']) deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base) @@ -66,7 +62,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', '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', @@ -83,59 +80,45 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libssh-4', 'libx264-152', 'libcurl4', - 'libpulse0']) - -deb_depends['19.04'] = copy.deepcopy(deb_depends_base) -deb_depends['19.04'].extend(['libboost-filesystem1.67.0', - 'libboost-thread1.67.0', - 'libboost-regex1.67.0', - 'libboost-date-time1.67.0', + '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', - 'libwxgtk3.0-0v5', - 'libicu63', - 'libnettle6', + 'libicu66', + 'libnettle7', 'libssh-4', 'libx264-155', 'libcurl4', - 'libpulse0']) - -deb_depends['19.10'] = copy.deepcopy(deb_depends_base) -deb_depends['19.10'].extend(['libboost-filesystem1.67.0', - 'libboost-thread1.67.0', - 'libboost-regex1.67.0', - 'libboost-date-time1.67.0', + 'libpulse0', + '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', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-0v5', - 'libicu63', - 'libnettle6', + 'libicu67', + 'libnettle8', 'libssh-4', - 'libx264-155', + 'libx264-160', 'libcurl4', - 'libpulse0']) - -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']) + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -152,7 +135,8 @@ 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', @@ -175,7 +159,9 @@ deb_depends['10'].extend(['libboost-filesystem1.67.0', 'libssh-gcrypt-4', 'libnettle6', 'libx264-155', - 'libcurl4']) + 'libcurl4', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', 'libxcb-xfixes0', @@ -194,16 +180,32 @@ deb_depends['unstable'].extend(['libboost-filesystem1.67.0', 'libicu63', 'libnettle6', 'libx264-155', - 'libcurl4']) + 'libcurl4', + 'libxerces-c3.2']) 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 don't have a new enough boost (1.64 or above) + # - 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 - return target.platform == 'windows' or target.platform == 'osx' or (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '18.10', '19.04']) + if target.platform == 'windows': + return True + if target.platform == 'osx': + return True + if target.platform == 'linux': + if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']: + return True + if target.distro == 'debian' and target.version == '10': + return True + if target.detail == 'appimage': + return True + if target.distro == 'fedora' and target.version == '31': + return True + if target.distro == 'centos' and target.version == '8': + return True + return False def packages(name, packages, f): s = '%s: ' % name @@ -282,9 +284,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_player', file=f) print('%{_bindir}/dcpomatic2_playlist', file=f) print('%{_bindir}/dcpomatic2_openssl', file=f) - if options['variant'] == 'swaroop-studio': - print('%{_bindir}/dcpomatic2_ecinema', file=f) - print('%{_bindir}/dcpomatic2_uuid', file=f) + print('%{_bindir}/dcpomatic2_combiner', 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) @@ -294,6 +294,9 @@ def make_spec(filename, version, target, options, requires=None): 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")): + 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) @@ -302,6 +305,7 @@ 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) @@ -314,11 +318,15 @@ def make_spec(filename, version, target, options, requires=None): 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', 'tr_TR', 'ko_KR']: + '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('', file=f) print('%prep', file=f) print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f) @@ -333,6 +341,9 @@ def make_spec(filename, version, target, options, requires=None): 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('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) @@ -353,40 +364,41 @@ def dependencies(target, options): 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', '20d3ddf', ffmpeg_options)] + if target.platform != 'linux' or target.distro != 'arch': + deps = [('ffmpeg-cdist', 'e89aa4a', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] # Let's use C++11 mode if we can cpp_lib_options = {'force-cpp11': True} if ( - (target.platform == 'osx' and target.bits == 64) or + (target.platform == 'osx') or (target.platform == 'windows')) else {} - deps.append(('libdcp', None, cpp_lib_options)) - deps.append(('libsub', None, cpp_lib_options)) - deps.append(('leqm-nrt', 'carl')) - deps.append(('rtaudio', 'carl')) + deps.append(('libdcp', 'c6665c1', cpp_lib_options)) + deps.append(('libsub', '64eb116', cpp_lib_options)) + deps.append(('leqm-nrt', '131f971')) + 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', 'carl')) + deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', 'carl2')) + deps.append(('lwext4', '01c7d4c')) + deps.append(('ffcmp', 'a915540')) return deps option_defaults = { "gui": True, "variant": None } def configure_options(target, options): - opt = '' + 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: @@ -405,7 +417,7 @@ def configure_options(target, options): # I worry that this will cause ABI problems but I don't have # a better solution. opt += ' --force-cpp11' - elif target.platform == 'osx' and target.bits == 64: + elif target.platform == 'osx': opt += ' --force-cpp11' if not options['gui']: @@ -419,7 +431,10 @@ def configure_options(target, options): opt += ' --static-dcpomatic' if can_build_disk(target): - opt += ' --enable-disk' + opt += ' --enable-disk' + + if target.platform == 'osx' and target.arch == 'arm64': + opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin return opt @@ -541,9 +556,7 @@ def build(target, options): else: target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options))) target.command('./waf') - - if target.platform == 'linux' or target.platform == 'osx': - target.command('./waf install') + target.command('./waf install') def package_windows(target): identifier = '' @@ -663,6 +676,7 @@ 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)) return out else: if target.bits == 32: @@ -674,12 +688,34 @@ def package(target, version, options): return package_debian(target, cpu, 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' and target.bits is None: - target.command('bash platform/osx/make_dmg.sh %s %s universal no %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')] - elif target.platform == 'osx' and target.bits == 64: - target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s %s' % (target.environment_prefix, target.directory, "yes" if options['disk'] else "no", target.apple_id, target.apple_password)) - return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] + elif target.platform == 'osx': + name = '' + if hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')): + name = 'arm-intel' + elif hasattr(target, 'arch'): + if target.arch == 'x86_64': + name = 'intel' + elif target.arch == 'arm64': + name = 'arm' + target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s %s' % (target.environment_prefix, target.directory, name, target.sdk, target.apple_id, target.apple_password)) + 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') @@ -711,12 +747,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 += '-t %s' % test + target.command(cmd)