From 99dc59786fdaa6709197a9eaf51821c412e24146 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 12 Jul 2014 22:38:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 5a228368..3839f227 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.95.0devel' +VERSION = '0.96.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4fdc2b90779981f28295380e6155485e56644bd9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 12 Jul 2014 22:38:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 3839f227..f19662ec 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.96.0' +VERSION = '0.96.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 009e07f1afe3290dabaf389c6b2909fee9e6fa2e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 23:33:09 +0100 Subject: Disable building of tests on --static Linux package builds. --- cscript | 2 +- wscript | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index df370a29..38ac40dd 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,7 @@ def dependencies(target): def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'linux': - cmd += ' --static' + cmd += ' --static --disable-tests' elif target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'osx': diff --git a/wscript b/wscript index f19662ec..0a15a5dd 100644 --- a/wscript +++ b/wscript @@ -11,6 +11,7 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--static', action='store_true', default=False, help='build libdcp and in-tree dependencies statically, and link statically to openjpeg and cxml') opt.add_option('--valgrind', action='store_true', default=False, help='build with instructions to Valgrind to reduce false positives') + opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') def configure(conf): conf.load('compiler_cxx') @@ -21,6 +22,7 @@ def configure(conf): conf.env.STATIC = conf.options.static conf.env.OSX = conf.options.osx conf.env.ENABLE_DEBUG = conf.options.enable_debug + conf.env.DISABLE_TESTS = conf.options.disable_tests if conf.options.target_windows: conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS') @@ -105,7 +107,8 @@ def configure(conf): lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store = 'BOOST_DATETIME') - conf.recurse('test') + if not conf.env.DISABLE_TESTS: + conf.recurse('test') conf.recurse('asdcplib') def build(bld): @@ -124,7 +127,8 @@ def build(bld): bld.recurse('src') bld.recurse('tools') - bld.recurse('test') + if not bld.env.DISABLE_TESTS: + bld.recurse('test') bld.recurse('asdcplib') bld.recurse('examples') -- cgit v1.2.3 From 93f428ac5ecda7675f538c34b766e5538d5bd75b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:44:30 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 0a15a5dd..e1113111 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.96.0devel' +VERSION = '0.97.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0c5d6669860461feddb5a97ffba907445be45c5a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:44:30 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index e1113111..c79a9904 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.97.0' +VERSION = '0.97.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 3b0aac5e949be74845b176dce442f388feb612d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 09:11:28 +0100 Subject: Bump required libcxml version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index c79a9904..7731de59 100644 --- a/wscript +++ b/wscript @@ -56,7 +56,7 @@ def configure(conf): conf.env.STLIB_CXML = ['cxml'] else: conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.11.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' -- cgit v1.2.3 From a55fc07bf282823f6c776ecf5c805946d3deb4de Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 09:12:35 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 7731de59..6e740edf 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.97.0devel' +VERSION = '0.98.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 190dc3381a03b5cdbe12881015d16ff18303844a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 09:12:35 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 6e740edf..c02685b9 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.98.0' +VERSION = '0.98.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3