summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-18 00:26:44 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-18 00:26:44 +0100
commit178fadde4c7b4c0816f06ead30030fa29e7d13c7 (patch)
tree9cb141456e4b1f457b09c53746a72014dfc563a1
parent3d88bdfd57f4f8a1a716ec0f7f7ab9438af9299d (diff)
cdist tinkering.
-rwxr-xr-xcbuild16
-rw-r--r--cscript13
2 files changed, 26 insertions, 3 deletions
diff --git a/cbuild b/cbuild
new file mode 100755
index 00000000..59beeb13
--- /dev/null
+++ b/cbuild
@@ -0,0 +1,16 @@
+#!/usr/bin/python
+
+import argparse
+import os
+
+parser = argparse.ArgumentParser()
+parser.add_argument('command')
+parser.add_argument('-p', '--prefix', help='prefix', required=True)
+args = parser.parse_args()
+
+def command(c):
+ print c
+ os.system(c)
+
+if args.command == 'build':
+ command('./waf configure --prefix=%s build install' % args.prefix)
diff --git a/cscript b/cscript
index 0457ebbf..9e0eaaac 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,14 @@
release_targets = ['source']
-def build(dep_prefix, install_prefix):
- command("""CXXFLAGS=-I%s/include LINKFLAGS=-L%s/lib PKG_CONFIG_PATH=%s/lib/pkgconfig
- ./waf configure --static-openjpeg --static-libdcp --prefix=%s build install""" % (dep_prefix, dep_prefix, dep_prefix, install_prefix))
+def build(dep_prefix, install_prefix, target, static, parallel):
+ configure = './waf configure --prefix=%s' % install_prefix
+ if static:
+ configure += ' --static-openjpeg --static-libdcp'
+
+ var = "CXXFLAGS=-I%s/include LINKFLAGS=-L%s/lib PKG_CONFIG_PATH=%s/lib/pkgconfig" % (dep_prefix, dep_prefix, dep_prefix)
+
+ command('%s %s' % (var, configure))
+ command('./waf build install')
+