X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=94a26d15decca79bb23d38233889902e6f88bf19;hb=8be82fcdcedcad8e22cd4065f2fea1b03e737826;hp=e1f9a7e0d716e4cb8963a7165e97cafde5c5582b;hpb=6302fa2b64123d70af7825153d981b88f240b22a;p=libsub.git diff --git a/cscript b/cscript index e1f9a7e..94a26d1 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libdcp', 'v1.2.7'),) + return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', '25e945f'), ('libdcp', '5e6d583')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory @@ -9,7 +9,7 @@ def build(target, options): cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' - if target.distro == 'debian' and target.version == 'unstable': + if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'): target.append_with_space('CXXFLAGS', '-std=c++11') if target.debug: cmd += ' --enable-debug' @@ -24,7 +24,10 @@ def make_doxygen(target): target.command('doxygen') return os.path.abspath('build/doc/html') -def test(target): +def test(target, test): if target.platform != 'windows': target.set('LC_ALL', 'C') - target.command('run/tests') + if test is None: + target.command('run/tests') + else: + target.command('run/tests --run_test=%s' % test)