projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use boost::optional for key id instead of an empty string.
[libdcp.git]
/
cscript
diff --git
a/cscript
b/cscript
index f21073f13cb1350686b03e9eb8e7c6111a8207c7..1a8113a1fd1f055b3f40df523aa889089591932e 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-1,16
+1,18
@@
import os
def dependencies(target):
import os
def dependencies(target):
- return (('libcxml', '
v0.05'), ('openjpeg-cdist', '6771627cfa63e315d2e23d81669cafcdc66ddc9f
'))
+ return (('libcxml', '
f35787e'), ('openjpeg-cdist', '5d8bffd
'))
-def build(target):
- cmd = './waf configure --
prefix=%s' % target.work_dir_cscript()
+def build(target
, options
):
+ cmd = './waf configure --
disable-examples --prefix=%s' % target.directory
if target.platform == 'linux':
cmd += ' --static'
if target.platform == 'linux':
cmd += ' --static'
+ if target.distro == 'centos':
+ cmd += ' --disable-tests'
elif target.platform == 'windows':
elif target.platform == 'windows':
- cmd += ' --target-windows'
+ cmd += ' --target-windows
--disable-tests
'
elif target.platform == 'osx':
elif target.platform == 'osx':
- cmd += ' --
osx
'
+ cmd += ' --
disable-tests
'
if target.debug:
cmd += ' --enable-debug'
if target.debug:
cmd += ' --enable-debug'
@@
-22,3
+24,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')