From b1f1e98ff6ae6b01a17e1fb422900fa99d735d28 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 21 Nov 2012 04:59:00 +0000 Subject: Remove remaining library code, Raul is now header only. git-svn-id: http://svn.drobilla.net/lad/trunk/raul@4837 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 45 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 78cab4c..031750f 100644 --- a/wscript +++ b/wscript @@ -1,4 +1,5 @@ #!/usr/bin/env python +import os import subprocess import waflib.Options as Options import waflib.extras.autowaf as autowaf @@ -64,6 +65,10 @@ def configure(conf): autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp') + # TODO: Version includes and use autowaf.set_lib_env() here + conf.env['INCLUDES_RAUL'] = [os.path.abspath(top) + '/raul'] + + autowaf.define(conf, 'RAUL_VERSION', RAUL_VERSION) conf.write_config_header('raul_config.h', remove=False) autowaf.display_msg(conf, "Unit tests", str(conf.env.BUILD_TESTS)) @@ -96,32 +101,10 @@ def build(bld): autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, '', 'GLIB GTHREAD', subst_dict=dict) - lib_source = ''' - src/Thread.cpp - ''' - framework = '' if Options.platform == 'darwin': framework = ' CoreServices ' - def set_defines(obj): - if bld.env.RAUL_CPP0x: - obj.defines = ['RAUL_CPP0x'] - - # Library - obj = bld(features = 'cxx cxxshlib', - export_includes = ['.'], - source = lib_source, - includes = ['.', './src'], - name = 'libraul', - target = 'raul', - uselib = 'GLIB GTHREAD', - lib = ['pthread'], - framework = framework, - install_path = '${LIBDIR}', - vnum = RAUL_LIB_VERSION) - set_defines(obj); - if bld.env.BUILD_TESTS: test_libs = ['pthread', 'rt'] test_cxxflags = [] @@ -129,19 +112,6 @@ def build(bld): test_libs += ['gcov'] test_cxxflags += ['-fprofile-arcs', '-ftest-coverage'] - # Static library (for unit test code coverage) - obj = bld(features = 'cxx cxxstlib', - source = lib_source, - includes = ['.', './src'], - lib = test_libs, - name = 'libraul_static', - target = 'raul_static', - uselib = 'GLIB GTHREAD', - framework = framework, - install_path = '', - cxxflags = test_cxxflags) - set_defines(obj); - # Unit tests for i in tests.split(): obj = bld(features = 'cxx cxxprogram', @@ -154,13 +124,12 @@ def build(bld): target = i, install_path = '', cxxflags = test_cxxflags) - set_defines(obj); + if bld.env.RAUL_CPP0x: + obj.defines = ['RAUL_CPP0x'] # Documentation autowaf.build_dox(bld, 'RAUL', RAUL_VERSION, top, out) - bld.add_post_fun(autowaf.run_ldconfig) - def test(ctx): autowaf.pre_test(ctx, APPNAME, dirs=['.', 'src', 'test']) autowaf.run_tests(ctx, APPNAME, tests.split(), dirs=['.', 'src', 'test']) -- cgit v1.2.1