projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
[libdcp.git]
/
cscript
diff --git
a/cscript
b/cscript
index e39268372d0c65dcd6ffdb65481c09e3860efec1..24f8e156a9e0d384162e6ece622b703924c9d33e 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-1,7
+1,7
@@
import os
def dependencies(target):
import os
def dependencies(target):
- return (('libcxml',
None
), ('openjpeg-cdist', '5d8bffd'))
+ return (('libcxml',
'v0.14.0'
), ('openjpeg-cdist', '5d8bffd'))
def build(target, options):
cmd = './waf configure --disable-examples --prefix=%s' % target.directory
def build(target, options):
cmd = './waf configure --disable-examples --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':
+ target.append_with_space('CXXFLAGS', '-std=c++11')
elif target.platform == 'windows':
cmd += ' --target-windows --disable-tests'
elif target.platform == 'osx':
elif target.platform == 'windows':
cmd += ' --target-windows --disable-tests'
elif target.platform == 'osx':
@@
-24,3
+26,8
@@
def make_doxygen(target):
os.makedirs('build/doc')
target.command('doxygen')
return os.path.abspath('build/doc/html')
os.makedirs('build/doc')
target.command('doxygen')
return os.path.abspath('build/doc/html')
+
+def test(target):
+ if target.platform != 'windows':
+ target.set('LC_ALL', 'C')
+ target.command('run/tests')