# -*- mode: python -*-
#
-# Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
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)
'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',
'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',
'libssh-gcrypt-4',
'libnettle6',
'libx264-148',
- 'libcurl3'])
+ 'libcurl3',
+ 'libxerces-c3.1'])
deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
'libxcb-xfixes0',
'libssh-gcrypt-4',
'libnettle6',
'libx264-155',
- 'libcurl4'])
+ 'libcurl4',
+ 'libxerces-c3.2',
+ 'libnanomsg5'])
deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
'libxcb-xfixes0',
'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 (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 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
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)
print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
print('%{_bindir}/dcpomatic2_player', file=f)
print('%{_bindir}/dcpomatic2_playlist', file=f)
- if options['variant'] == 'swaroop-studio':
- print('%{_bindir}/dcpomatic2_ecinema', file=f)
- print('%{_bindir}/dcpomatic2_uuid', file=f)
+ print('%{_bindir}/dcpomatic2_openssl', 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)
print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_batch.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")):
+ 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)
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}/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('%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('./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('', file=f)
print('%post', file=f)
print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
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', '20d3ddf', ffmpeg_options)]
+ if target.platform != 'linux' or target.distro != 'arch':
+ deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', None))
- deps.append(('libsub', None))
- deps.append(('rtaudio-cdist', None))
+ # 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', '2b522d0', cpp_lib_options))
+ deps.append(('libsub', 'dcd8bf5', cpp_lib_options))
+ deps.append(('leqm-nrt', 'carl'))
+ deps.append(('rtaudio', 'carl'))
+ # 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'))
+ if can_build_disk(target):
+ deps.append(('lwext4', '370b3de6'))
+ deps.append(('ffcmp', None))
return deps
-def option_defaults():
- return { "gui": True, "variant": None }
+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:
# 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'
if target.debug and target.platform == 'windows':
opt += ' --static-dcpomatic'
+ if can_build_disk(target):
+ opt += ' --enable-disk'
+
return opt
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,
'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',
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 = ''
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:
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('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
+ target.command('cp -r %s/share/libdcp/xsd 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)
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:
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' % (target.environment_prefix, target.directory))
+ 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' % (target.environment_prefix, target.directory))
- return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
+ target.command('bash platform/osx/make_dmg.sh %s %s thin %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')
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)