projects
/
libsub.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace DCP parser with basic version that uses libdcp.
[libsub.git]
/
cscript
diff --git
a/cscript
b/cscript
index 8faa9a48db569a7c8d2d0a399e1e78f88d4894c1..6ce93191b46e6c4efb1017f6122f75d42e78753d 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-1,7
+1,7
@@
import os
def dependencies(target):
import os
def dependencies(target):
- return (('
libdcp', '75356e0'),
)
+ return (('
asdcplib-cth', 'v0.1.3'), ('libcxml', 'v0.15.4'), ('libdcp', None)
)
def build(target, options):
cmd = './waf configure --prefix=%s' % target.directory
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'
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':
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')
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')
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)