projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some unnecessary includes.
[libdcp.git]
/
cscript
diff --git
a/cscript
b/cscript
index e39268372d0c65dcd6ffdb65481c09e3860efec1..9b8ba84f7301deea33082cbf5c4807e0a90dc9f2 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.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.0
'))
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,8
+9,10
@@
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')
elif target.platform == 'windows':
elif target.platform == 'windows':
- cmd += ' --target-windows --disable-
tests
'
+ cmd += ' --target-windows --disable-
gcov
'
elif target.platform == 'osx':
cmd += ' --disable-tests'
elif target.platform == 'osx':
cmd += ' --disable-tests'
@@
-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')