import os
import shutil
-option_defaults = { 'jpeg': 'oj2' }
-
def dependencies(target, options):
- libcxml = ('libcxml', 'v0.17.3')
- if options['jpeg'] == 'oj1':
- return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
- else:
- return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
+ return (('libcxml', 'v0.17.5'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
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 += f' --target-windows-{target.bits} --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)
+