From 3d73fba2a4f92a08200571c77081604586e0dc93 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 15:08:47 +0100 Subject: cscript tweaks. --- cscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 5413fdbc..30fd4aa6 100644 --- a/cscript +++ b/cscript @@ -1,17 +1,17 @@ import os -def build(env, target): - cmd = './waf configure --prefix=%s' % env.work_dir_cscript() +def build(target): + cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'linux': 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') + target.command(cmd) + target.command('./waf build install') def make_doxygen(env): os.makedirs('build/doc') - env.command('doxygen') + target.command('doxygen') return os.path.abspath('build/doc/html') -- cgit v1.2.3 From 78d8ec2d20494e00da8f20091d65be940595c955 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 15:45:12 +0100 Subject: cscript tweak. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 30fd4aa6..bfe16052 100644 --- a/cscript +++ b/cscript @@ -11,7 +11,7 @@ def build(target): target.command(cmd) target.command('./waf build install') -def make_doxygen(env): +def make_doxygen(target): os.makedirs('build/doc') target.command('doxygen') return os.path.abspath('build/doc/html') -- cgit v1.2.3 From adbf32154e0322121a50ef285c9835d636ee0da1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 16:24:26 +0100 Subject: Fix static flags. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index bfe16052..668805c2 100644 --- a/cscript +++ b/cscript @@ -3,7 +3,7 @@ import os def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'linux': - cmd += ' --static-libdcp --static-openjpeg' + cmd += ' --static' elif target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'osx': -- cgit v1.2.3 From efb32ed996ce74cebf512ae37b3e0bfe5177b825 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 16:32:11 +0100 Subject: Add libcxml dep to cscript. --- cscript | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 668805c2..24f82c86 100644 --- a/cscript +++ b/cscript @@ -1,5 +1,12 @@ import os +def dependencies(target): + if target.platform == 'windows': + return () + else: + # XXX: should be some versions in here + return (('libcxml', None)) + def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'linux': -- cgit v1.2.3 From 787062dca7ebc44cf69f9dbab759ec530ba5d657 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 16:38:34 +0100 Subject: Tweak cscript. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 24f82c86..cec6d88b 100644 --- a/cscript +++ b/cscript @@ -5,7 +5,7 @@ def dependencies(target): return () else: # XXX: should be some versions in here - return (('libcxml', None)) + return (('libcxml', None),) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From bf9eb612ef464db95c365e0de4ebd98ab23e5b9c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 16:40:05 +0100 Subject: Tweak cscript. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index cec6d88b..a1a9232d 100644 --- a/cscript +++ b/cscript @@ -5,7 +5,7 @@ def dependencies(target): return () else: # XXX: should be some versions in here - return (('libcxml', None),) + return (('libcxml', None), ('openjpeg-cdist', None)) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 3fe4497fdb70f0e39535eb746af58093ddea001b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 21:28:58 +0100 Subject: Fix install prefix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index a1a9232d..b56c1d63 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): return (('libcxml', None), ('openjpeg-cdist', None)) def build(target): - cmd = './waf configure --prefix=%s' % target.work_dir_cscript() + cmd = './waf configure --prefix=%s/%s' % (target.work_dir_cscript(), target.install_prefix) if target.platform == 'linux': cmd += ' --static' elif target.platform == 'windows': -- cgit v1.2.3 From 71c0db318e478259f038982fd979c3fd916e2b42 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Jun 2013 23:52:55 +0100 Subject: cscript fiddling. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index b56c1d63..a1a9232d 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): return (('libcxml', None), ('openjpeg-cdist', None)) def build(target): - cmd = './waf configure --prefix=%s/%s' % (target.work_dir_cscript(), target.install_prefix) + cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'linux': cmd += ' --static' elif target.platform == 'windows': -- cgit v1.2.3 From f51e1ec6f5cacd05196ce7625709c18f6b38f63e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 2 Jul 2013 11:14:15 +0100 Subject: Add debug option to cscript. --- cscript | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index a1a9232d..23dea9cd 100644 --- a/cscript +++ b/cscript @@ -15,6 +15,10 @@ def build(target): cmd += ' --target-windows' elif target.platform == 'osx': cmd += ' --osx' + + if target.debug: + cmd += ' --enable-debug' + target.command(cmd) target.command('./waf build install') -- cgit v1.2.3