#
-# Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
#
# This file is part of libdcp.
#
import os
import shutil
-option_defaults = { 'jpeg': 'oj2' }
-
def dependencies(target, options):
- libcxml = ('libcxml', 'v0.17.0')
- if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
- return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
- else:
- return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
+ return (('libcxml', 'v0.17.5'), ('openjpeg', 'a1403c2'), ('asdcplib', 'ae75eb417d3804a6d723e2cf09647b54b15df5db'))
def build(target, options):
cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
- cmd += ' --jpeg=%s' % options['jpeg']
if target.platform == 'linux':
cmd += ' --static'
if not (target.distro == 'ubuntu' and target.version == '18.04'):
# We only build tests on Ubuntu 18.04
cmd += ' --disable-tests'
elif target.platform == 'windows':
- cmd += ' --target-windows --disable-gcov --disable-tests'
- if target.version == 'xp':
- # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
- cmd += ' --jpeg=oj1'
+ cmd += f' --target-windows-{target.bits}'
if target.debug:
cmd += ' --enable-debug'
target.command('doxygen')
return os.path.abspath('build/doc/html')
-def test(target, test):
- if target.platform != 'windows':
- target.set('LC_ALL', 'C')
- if test is None:
- target.command('run/tests')
- else:
- target.command('run/tests --run_test=%s' % test)
+def test(target, options, test):
+ target.set('LC_ALL', 'C')
+ cmd = 'run\\tests ' if target.platform == 'windows' else 'run/tests '
+ if test is not None:
+ cmd += '-t %s' % test
+ target.command(cmd)
+