X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2b9e81782c629846ec53274766c28732622df024;hb=d848eed414a5d5c8bc35a3ec843f01e8b609f60d;hp=6ad0775e7202cbbdc9cb1f9829510390f6c7e16b;hpb=564552a0ff997a43fbfca2c574d240532463fc2e;p=libsub.git diff --git a/cscript b/cscript index 6ad0775..2b9e817 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libdcp', 'bff6a34'),) + return (('asdcplib-cth', 'd2042ad'), ('libcxml', 'v0.15.1')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory @@ -9,6 +9,8 @@ def build(target, options): cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' + 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' if target.platform == 'windows': @@ -22,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)