From 68301a6fd61adac018b96f3616f07ca5f90698e1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Apr 2013 16:27:45 +0100 Subject: Add cscript. --- cscript | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 cscript (limited to 'cscript') diff --git a/cscript b/cscript new file mode 100644 index 00000000..0a04589d --- /dev/null +++ b/cscript @@ -0,0 +1,2 @@ +builds = ['source'] + -- cgit v1.2.3 From 4e374e18ce142e3418a74d19cd78d3cf9e416fc8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 10:42:31 +0100 Subject: cscript tweak. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0a04589d..501d3548 100644 --- a/cscript +++ b/cscript @@ -1,2 +1,2 @@ -builds = ['source'] +release_targets = ['source'] -- cgit v1.2.3 From 77c46d57b694506e0834244dde1616c63771f0e6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 13:17:52 +0100 Subject: Add build() method to cscript. --- cscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 501d3548..18837ad8 100644 --- a/cscript +++ b/cscript @@ -1,2 +1,5 @@ release_targets = ['source'] +def build(prefix): + command('./waf configure --prefix=%s build install' % prefix) + -- cgit v1.2.3 From 3b1afd9479b20b0374d8fa370f82b806b4465a6d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 13:23:53 +0100 Subject: Add paths. --- cscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 18837ad8..f5590c55 100644 --- a/cscript +++ b/cscript @@ -1,5 +1,6 @@ release_targets = ['source'] def build(prefix): - command('./waf configure --prefix=%s build install' % prefix) + command('CXXFLAGS=-I%s/include LINKFLAGS=-L%s/lib PKG_CONFIG_PATH=%s/lib/pkgconfig ./waf configure --prefix=%s build install' % (prefix, prefix, prefix, prefix)) + -- cgit v1.2.3 From 6da141cf4717903a979c80a5bc0a70ef354013b7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 20:39:50 +0100 Subject: cscript must build statically. --- cscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f5590c55..f0e28128 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,7 @@ release_targets = ['source'] def build(prefix): - command('CXXFLAGS=-I%s/include LINKFLAGS=-L%s/lib PKG_CONFIG_PATH=%s/lib/pkgconfig ./waf configure --prefix=%s build install' % (prefix, prefix, prefix, 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""" % (prefix, prefix, prefix, prefix)) -- cgit v1.2.3 From 3d88bdfd57f4f8a1a716ec0f7f7ab9438af9299d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 20:42:20 +0100 Subject: Fix build method. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index f0e28128..0457ebbf 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ release_targets = ['source'] -def build(prefix): +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""" % (prefix, prefix, prefix, prefix)) + ./waf configure --static-openjpeg --static-libdcp --prefix=%s build install""" % (dep_prefix, dep_prefix, dep_prefix, install_prefix)) -- cgit v1.2.3 From 178fadde4c7b4c0816f06ead30030fa29e7d13c7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 00:26:44 +0100 Subject: cdist tinkering. --- cbuild | 16 ++++++++++++++++ cscript | 13 ++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100755 cbuild (limited to 'cscript') 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') + -- cgit v1.2.3 From 160d55ae1f3fe8d84ade777154c673d350e3c02c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 21:40:15 +0100 Subject: cdist bits. --- cbuild | 7 ++++++- cscript | 21 ++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'cscript') diff --git a/cbuild b/cbuild index 59beeb13..836dabaa 100755 --- a/cbuild +++ b/cbuild @@ -6,6 +6,7 @@ import os parser = argparse.ArgumentParser() parser.add_argument('command') parser.add_argument('-p', '--prefix', help='prefix', required=True) +parser.add_argument('-s', '--static', help='build statically', action='store_true') args = parser.parse_args() def command(c): @@ -13,4 +14,8 @@ def command(c): os.system(c) if args.command == 'build': - command('./waf configure --prefix=%s build install' % args.prefix) + cmd = './waf configure --prefix=%s' % args.prefix + if args.static: + cmd += ' --static-libdcp --static-openjpeg' + cmd += ' build install' + command(cmd) diff --git a/cscript b/cscript index 9e0eaaac..09bd76bb 100644 --- a/cscript +++ b/cscript @@ -1,14 +1,9 @@ -release_targets = ['source'] - -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') - - +def build(env, target): + cmd = './waf configure --prefix=%s' % env.work_dir(True) + if target.platform == 'linux': + cmd += ' --static-libdcp --static-openjpeg' + elif target.platform == 'windows': + cmd += ' --target-windows' + env.command(cmd) + env.command('./waf build install') -- cgit v1.2.3 From ba39445dc02a21fd29562ba0693dd7e3d9f3308b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:05:23 +0100 Subject: cscript. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 09bd76bb..459ddc3a 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ def build(env, target): - cmd = './waf configure --prefix=%s' % env.work_dir(True) + cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'linux': cmd += ' --static-libdcp --static-openjpeg' elif target.platform == 'windows': -- cgit v1.2.3 From f985e5e8cccaa44704d51dcfea3cc5042e22781f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2013 13:48:04 +0100 Subject: Add make_doxygen to cscript. --- cscript | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 459ddc3a..9f50e689 100644 --- a/cscript +++ b/cscript @@ -7,3 +7,7 @@ def build(env, target): cmd += ' --target-windows' env.command(cmd) env.command('./waf build install') + +def make_doxygen(env): + env.command('doxygen') + return os.path.abspath('build/doc/html') -- cgit v1.2.3 From 8cb727dc875648b5a13b4209a771bffd3747b8ff Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2013 16:02:28 +0100 Subject: cscript tweak. --- cscript | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 9f50e689..3510f709 100644 --- a/cscript +++ b/cscript @@ -10,4 +10,8 @@ def build(env, target): def make_doxygen(env): env.command('doxygen') + try: + os.makedirs('build/doc') + except: + pass return os.path.abspath('build/doc/html') -- cgit v1.2.3 From 78957123f6e70e9460fd1707a047f221037e5d30 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2013 16:04:38 +0100 Subject: cscript tweaks. --- cbuild | 21 --------------------- cscript | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100755 cbuild (limited to 'cscript') diff --git a/cbuild b/cbuild deleted file mode 100755 index 836dabaa..00000000 --- a/cbuild +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/python - -import argparse -import os - -parser = argparse.ArgumentParser() -parser.add_argument('command') -parser.add_argument('-p', '--prefix', help='prefix', required=True) -parser.add_argument('-s', '--static', help='build statically', action='store_true') -args = parser.parse_args() - -def command(c): - print c - os.system(c) - -if args.command == 'build': - cmd = './waf configure --prefix=%s' % args.prefix - if args.static: - cmd += ' --static-libdcp --static-openjpeg' - cmd += ' build install' - command(cmd) diff --git a/cscript b/cscript index 3510f709..468b4b4d 100644 --- a/cscript +++ b/cscript @@ -9,9 +9,9 @@ def build(env, target): env.command('./waf build install') def make_doxygen(env): - env.command('doxygen') try: os.makedirs('build/doc') except: pass + env.command('doxygen') return os.path.abspath('build/doc/html') -- cgit v1.2.3 From 635fdc3e5ab744d064bf93cb164a738489971954 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2013 16:05:19 +0100 Subject: cscript tweaks. --- cscript | 1 + 1 file changed, 1 insertion(+) (limited to 'cscript') diff --git a/cscript b/cscript index 468b4b4d..9cc47606 100644 --- a/cscript +++ b/cscript @@ -13,5 +13,6 @@ def make_doxygen(env): os.makedirs('build/doc') except: pass + env.command('pwd') env.command('doxygen') return os.path.abspath('build/doc/html') -- cgit v1.2.3 From 085f9fa7a4e389a5579742f20e142513c21bbd82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2013 16:06:09 +0100 Subject: cscript tweaks. --- cscript | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 9cc47606..18913fa1 100644 --- a/cscript +++ b/cscript @@ -1,3 +1,4 @@ +import os def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() @@ -9,10 +10,6 @@ def build(env, target): env.command('./waf build install') def make_doxygen(env): - try: - os.makedirs('build/doc') - except: - pass - env.command('pwd') + os.makedirs('build/doc') env.command('doxygen') return os.path.abspath('build/doc/html') -- cgit v1.2.3 From efc228537094ecb30fe485709f03b9560bcad718 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 17:47:39 +0100 Subject: Tweak cscript for OS X --- cscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 18913fa1..5413fdbc 100644 --- a/cscript +++ b/cscript @@ -6,6 +6,8 @@ def build(env, target): cmd += ' --static-libdcp --static-openjpeg' elif target.platform == 'windows': cmd += ' --target-windows' + elif target.platform == 'osx': + cmd += ' --osx' env.command(cmd) env.command('./waf build install') -- cgit v1.2.3