print('%{_bindir}/dcpomatic2_player', file=f)
print('%{_bindir}/dcpomatic2_playlist', file=f)
print('%{_bindir}/dcpomatic2_openssl', file=f)
+ print('%{_bindir}/dcpomatic2_combiner', file=f)
if options['variant'] == 'swaroop-studio':
print('%{_bindir}/dcpomatic2_ecinema', file=f)
print('%{_bindir}/dcpomatic2_uuid', 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_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}/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)
(target.platform == 'osx' and target.bits == 64) or
(target.platform == 'windows')) else {}
- deps.append(('libdcp', '184bdd2', cpp_lib_options))
- deps.append(('libsub', '72bf4fc', cpp_lib_options))
+ deps.append(('libdcp', 'd08f689', cpp_lib_options))
+ deps.append(('libsub', '8f67794', cpp_lib_options))
deps.append(('leqm-nrt', 'carl'))
deps.append(('rtaudio', 'carl'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('openssl', 'carl'))
if can_build_disk(target):
deps.append(('lwext4', '370b3de6'))
+ deps.append(('ffcmp', None))
return deps
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:
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')]
+ 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 += '--run_test=%s' % test
+ target.command(cmd)