From 51701447357322a6e76b2ba1c2f3e884e72da51f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Apr 2013 12:58:45 +0100 Subject: Enable static build. --- src/wscript | 8 +++++++- wscript | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/wscript b/src/wscript index e1c405a..70f4b27 100644 --- a/src/wscript +++ b/src/wscript @@ -1,5 +1,8 @@ def build(bld): - obj = bld(features = 'cxx cxxshlib') + if bld.env.STATIC: + obj = bld(features = 'cxx cxxstlib') + else: + obj = bld(features = 'cxx cxxshlib') obj.name = 'libcxml' obj.target = 'cxml' obj.export_includes = ['.'] @@ -7,3 +10,6 @@ def build(bld): obj.source = "cxml.cc" bld.install_files('${PREFIX}/include/libcxml', "cxml.h") + if bld.env.STATIC: + bld.install_files('${PREFIX}/lib', 'libcxml.a') + diff --git a/wscript b/wscript index d3d2764..fda4bac 100644 --- a/wscript +++ b/wscript @@ -4,12 +4,14 @@ VERSION = '0.04pre' def options(opt): opt.load('compiler_cxx') opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows') + opt.add_option('--static', action='store_true', default = False, help = 'build statically') def configure(conf): conf.load('compiler_cxx') conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2']) conf.env.TARGET_WINDOWS = conf.options.target_windows + conf.env.STATIC = conf.options.static if conf.options.target_windows: boost_lib_suffix = '-mt' -- cgit v1.2.3 From d21d1c389e101333039df68dddfdc923b24d3353 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Apr 2013 12:59:13 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index fda4bac..7d5363d 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ APPNAME = 'libcxml' -VERSION = '0.04pre' +VERSION = '0.04' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d7c9fdcca5559465f9a3ac94a9e168ee2adb3dc4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Apr 2013 12:59:13 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 7d5363d..445d953 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ APPNAME = 'libcxml' -VERSION = '0.04' +VERSION = '0.05pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 69b0e89d8eb28fd1e2585bfdd6f7521603a319b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 10:42:47 +0100 Subject: cscript tweak. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 0a04589..501d354 100644 --- a/cscript +++ b/cscript @@ -1,2 +1,2 @@ -builds = ['source'] +release_targets = ['source'] -- cgit v1.2.3