X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=af57aa6dbd32dac646d837a5fa8b60e2669be04e;hp=5aeba3da30db0a3ffc243a63a0fe53a71c78a2ac;hb=51bb8ac64aabeb5b509ffbaae415900d1b0299bc;hpb=5a3e836da9480bca0c3ef3384fa2010f358ccc7e diff --git a/cscript b/cscript index 5aeba3da3..af57aa6db 100644 --- a/cscript +++ b/cscript @@ -29,18 +29,12 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -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['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) -deb_build_depends['10'].extend(['libssh-gcrypt-dev']) +for v in ['16.04', '18.04', '20.04', '20.10', '21.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev']) +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['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() @@ -93,7 +87,6 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-gtk3-0v5', 'libicu66', 'libnettle7', 'libssh-4', @@ -112,16 +105,34 @@ deb_depends['20.10'].extend(['libboost-filesystem1.71.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-gtk3-0v5', - 'libicu66', - 'libnettle7', + 'libicu67', + 'libnettle8', 'libssh-4', - 'libx264-155', + 'libx264-160', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) + +deb_depends['21.04'] = copy.deepcopy(deb_depends_base) +deb_depends['21.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', + 'libicu67', + 'libnettle8', + 'libssh-4', + 'libx264-160', 'libcurl4', 'libpulse0', 'libxerces-c3.2', 'libnanomsg5']) + deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libboost-thread1.62.0', @@ -286,9 +297,8 @@ 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) + print('%{_bindir}/dcpomatic2_verify', 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) @@ -298,7 +308,7 @@ 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_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) @@ -323,11 +333,14 @@ def make_spec(filename, version, target, options, requires=None): 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']: 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) @@ -335,13 +348,17 @@ 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' % + 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) 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/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) @@ -363,27 +380,23 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)] + 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 == 'windows')) else {} - - deps.append(('libdcp', '40f6f7d', cpp_lib_options)) - deps.append(('libsub', 'c5b7a36', cpp_lib_options)) - deps.append(('leqm-nrt', 'carl')) - deps.append(('rtaudio', 'carl')) + deps.append(('libdcp', 'f536156')) + deps.append(('libsub', '6dd6a0a')) + 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', '370b3de6')) + deps.append(('lwext4', '9d20ec5')) + deps.append(('ffcmp', 'a915540')) return deps @@ -392,8 +405,10 @@ option_defaults = { "gui": True, "variant": None } def configure_options(target, options): opt = ' --warnings-are-errors' - if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'): - # Currently we only build tests on Ubuntu 18.04 + if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or + (target.platform == 'osx') or + (target.platform == 'windows')): + # Currently we only build tests on Ubuntu 18.04, macOS and Windows opt += ' --disable-tests' if target.debug: @@ -407,13 +422,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' - elif target.platform == 'osx' and target.bits == 64: - opt += ' --force-cpp11' if not options['gui']: opt += ' --disable-gui' @@ -426,7 +434,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 @@ -578,6 +589,7 @@ 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')) @@ -634,11 +646,13 @@ def make_appimage(target, nice_name, internal_name, version): 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)) with open('build/%s.AppDir/AppRun' % nice_filename, '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) @@ -680,12 +694,26 @@ 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' % (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': + target.command('bash platform/osx/make_dmg.sh %s %s %s %s' % (target.environment_prefix, target.directory, 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') @@ -717,12 +745,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)