From 9f1ff36d40f916c253cebb1e9f336af53ce31f5d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 29 Nov 2008 03:23:26 +0000 Subject: Upgrade to waf 1.5.0. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1823 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/wscript | 11 +++++------ src/engine/NodeFactory.cpp | 10 +++++----- src/engine/NodeFactory.hpp | 2 +- src/engine/wscript | 40 +++++++++++++++++++--------------------- src/gui/wscript | 11 +++++------ src/ingen/wscript | 8 ++++---- src/module/wscript | 5 ++--- src/serialisation/wscript | 5 ++--- src/shared/wscript | 17 ++++++++--------- 9 files changed, 51 insertions(+), 58 deletions(-) (limited to 'src') diff --git a/src/client/wscript b/src/client/wscript index ff3f8254..76666d94 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -1,9 +1,8 @@ #!/usr/bin/env python -import Params import autowaf def build(bld): - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' ClientStore.cpp NodeModel.cpp @@ -16,22 +15,22 @@ def build(bld): client.cpp ''' - if bld.env()['HAVE_SOUP'] == 1: + if bld.env['HAVE_SOUP'] == 1: obj.source += ''' HTTPClientReceiver.cpp HTTPEngineSender.cpp ''' - if bld.env()['HAVE_XML2'] == 1: + if bld.env['HAVE_XML2'] == 1: obj.source += ' DeprecatedLoader.cpp ' - if bld.env()['HAVE_LIBLO'] == 1: + if bld.env['HAVE_LIBLO'] == 1: obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp ' obj.includes = ['.', '..', '../common'] obj.name = 'libingen_client' obj.target = 'ingen_client' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' obj.uselib_local = 'libingen_shared' autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP LIBLO SOUP') diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp index 7e5375c2..8031e27b 100644 --- a/src/engine/NodeFactory.cpp +++ b/src/engine/NodeFactory.cpp @@ -31,7 +31,7 @@ #include "InternalTransport.hpp" #include "PatchImpl.hpp" #include "InternalPlugin.hpp" -#ifdef HAVE_LADSPA +#ifdef HAVE_LADSPA_H #include "LADSPANode.hpp" #include "LADSPAPlugin.hpp" #endif @@ -84,7 +84,7 @@ NodeFactory::plugin(const string& type, const string& lib, const string& label) if (type != "LADSPA" || lib == "" || label == "") return NULL; -#ifdef HAVE_LADSPA +#ifdef HAVE_LADSPA_H for (Plugins::const_iterator i = _plugins.begin(); i != _plugins.end(); ++i) { LADSPAPlugin* lp = dynamic_cast(i->second); if (lp && lp->library_name() == lib @@ -118,7 +118,7 @@ NodeFactory::load_plugins() load_lv2_plugins(); #endif -#ifdef HAVE_LADSPA +#ifdef HAVE_LADSPA_H load_ladspa_plugins(); #endif @@ -189,7 +189,7 @@ NodeFactory::load_lv2_plugins() #endif // HAVE_SLV2 -#ifdef HAVE_LADSPA +#ifdef HAVE_LADSPA_H /** Loads information about all LADSPA plugins into internal plugin database. */ void @@ -281,7 +281,7 @@ NodeFactory::load_ladspa_plugins() closedir(pdir); } } -#endif // HAVE_LADSPA +#endif // HAVE_LADSPA_H } // namespace Ingen diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp index 08a7ba3a..f25f31fa 100644 --- a/src/engine/NodeFactory.hpp +++ b/src/engine/NodeFactory.hpp @@ -68,7 +68,7 @@ public: PluginImpl* plugin(const string& type, const string& lib, const string& label); private: -#ifdef HAVE_LADSPA +#ifdef HAVE_LADSPA_H void load_ladspa_plugins(); #endif diff --git a/src/engine/wscript b/src/engine/wscript index 01b63e84..1ab68cc7 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -1,5 +1,4 @@ #!/usr/bin/env python -import Params import autowaf def build(bld): @@ -37,21 +36,21 @@ def build(bld): ingen_engine.cpp ''' - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = core_source - if bld.env()['HAVE_LADSPA'] == 1: + if bld.env['HAVE_LADSPA_H'] == 1: obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp ' - if bld.env()['HAVE_SLV2'] == 1: + if bld.env['HAVE_SLV2'] == 1: obj.source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp ' obj.includes = ['.', '..', '../common', './events'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' obj.uselib_local = 'libingen_shared' core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM' autowaf.use_lib(bld, obj, core_libs) - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' events/SetPortValueEvent.cpp QueuedEventSource.cpp @@ -86,11 +85,11 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_queued' obj.target = 'ingen_engine_queued' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' autowaf.use_lib(bld, obj, core_libs) - if bld.env()['HAVE_SOUP'] == 1: - obj = bld.create_obj('cpp', 'shlib') + if bld.env['HAVE_SOUP'] == 1: + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' QueuedEventSource.cpp QueuedEngineInterface.cpp @@ -100,11 +99,11 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_http' obj.target = 'ingen_engine_http' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' autowaf.use_lib(bld, obj, core_libs + ' SOUP') - if bld.env()['HAVE_LIBLO'] == 1: - obj = bld.create_obj('cpp', 'shlib') + if bld.env['HAVE_LIBLO'] == 1: + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' QueuedEventSource.cpp QueuedEngineInterface.cpp @@ -114,30 +113,29 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_osc' obj.target = 'ingen_engine_osc' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' autowaf.use_lib(bld, obj, core_libs + ' LIBLO') - if bld.env()['HAVE_JACK'] == 1: - obj = bld.create_obj('cpp', 'shlib') + if bld.env['HAVE_JACK'] == 1: + obj = bld.new_task_gen('cxx', 'shlib') obj.source = 'JackAudioDriver.cpp JackMidiDriver.cpp' obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_jack' obj.target = 'ingen_engine_jack' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' autowaf.use_lib(bld, obj, core_libs + ' JACK') # Lightweight ingen/lv2 wrapper - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = core_source - if bld.env()['HAVE_LADSPA'] == 1: + if bld.env['HAVE_LADSPA_H'] == 1: obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp ' - if bld.env()['HAVE_SLV2'] == 1: + if bld.env['HAVE_SLV2'] == 1: obj.source += ' LV2Plugin.cpp LV2Node.cpp ' obj.includes = ['.', '..', '../common', './events'] obj.name = 'ingen_lv2' obj.target = 'ingen.lv2/ingen_lv2' - #obj.inst_dir = 'lib/lv2/ingen.lv2' - obj.inst_var = 0 + obj.install_path = '' core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM' autowaf.use_lib(bld, obj, core_libs) diff --git a/src/gui/wscript b/src/gui/wscript index d00606eb..87be97e4 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -1,9 +1,8 @@ #!/usr/bin/env python -import Params import autowaf def build(bld): - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' App.cpp BreadCrumbBox.cpp @@ -39,13 +38,13 @@ def build(bld): gui.cpp ''' - if bld.env()['HAVE_CURL'] != 0: + if bld.env['HAVE_CURL'] != 0: obj.source += 'UploadPatchWindow.cpp' obj.includes = ['.', '..', '../common', '../client', '../module'] obj.name = 'libingen_gui' obj.target = 'ingen_gui' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' obj.uselib_local = 'libingen_shared' autowaf.use_lib(bld, obj, ''' CURL @@ -64,7 +63,7 @@ def build(bld): ''') # GUI runtime files - install_files('DATADIR', 'ingen', 'ingen_gui.glade') - install_files('DATADIR', 'ingen', 'ingen.svg') + bld.install_files('${DATADIR}/ingen', 'ingen_gui.glade') + bld.install_files('${DATADIR}/ingen', 'ingen.svg') diff --git a/src/ingen/wscript b/src/ingen/wscript index 688c16db..91a5a1c2 100644 --- a/src/ingen/wscript +++ b/src/ingen/wscript @@ -2,16 +2,16 @@ import autowaf def build(bld): - obj = bld.create_obj('cpp', 'program') + obj = bld.new_task_gen('cxx', 'program') obj.target = 'ingen' obj.source = 'main.cpp cmdline.c' obj.includes = ['../common', '../'] - obj.defines = 'VERSION=\\\"' + bld.env()['INGEN_VERSION'] + '\\\"' + obj.defines = 'VERSION=\\\"' + bld.env['INGEN_VERSION'] + '\\\"' obj.uselib_local = 'libingen_module libingen_shared' - obj.inst_dir = bld.env()['BINDIRNAME'] + obj.install_path = '${BINDIR}' autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL LV2CORE SLV2 INGEN LIBLO SOUP') autowaf.build_wrapper(bld, 'ingen.in', obj) - install_files('DATADIR', 'applications', 'ingen.desktop') + bld.install_files('${DATADIR}/applications', 'ingen.desktop') diff --git a/src/module/wscript b/src/module/wscript index ee6545cc..c8a250c9 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -1,9 +1,8 @@ #!/usr/bin/env python -import Params import autowaf def build(bld): - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' Module.cpp global.cpp @@ -13,6 +12,6 @@ def build(bld): obj.target = 'ingen_module' obj.vnum = '0.0.0' obj.uselib_local = 'libingen_shared' - obj.inst_dir = bld.env()['LIBDIRNAME'] + obj.install_path = '${LIBDIR}' autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') diff --git a/src/serialisation/wscript b/src/serialisation/wscript index b946e7bf..b72b6507 100644 --- a/src/serialisation/wscript +++ b/src/serialisation/wscript @@ -1,9 +1,8 @@ #!/usr/bin/env python -import Params import autowaf def build(bld): - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' Parser.cpp Serialiser.cpp @@ -12,7 +11,7 @@ def build(bld): obj.includes = ['.', '..', '../common'] obj.name = 'libingen_serialisation' obj.target = 'ingen_serialisation' - obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' + obj.install_path = '${LIBDIR}/ingen' obj.uselib_local = 'libingen_shared' autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') diff --git a/src/shared/wscript b/src/shared/wscript index a758b8ad..eae1eee0 100644 --- a/src/shared/wscript +++ b/src/shared/wscript @@ -1,9 +1,8 @@ #!/usr/bin/env python -import Params import autowaf def build(bld): - obj = bld.create_obj('cpp', 'shlib') + obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' Builder.cpp ClashAvoider.cpp @@ -12,15 +11,15 @@ def build(bld): Store.cpp runtime_paths.cpp ''' - if bld.env()['HAVE_LIBLO'] == 1: + if bld.env['HAVE_LIBLO'] == 1: obj.source += ' OSCSender.cpp ' - if bld.env()['HAVE_SOUP'] == 1: + if bld.env['HAVE_SOUP'] == 1: autowaf.use_lib(bld, obj, 'SOUP') obj.source += ' HTTPSender.cpp ' - obj.includes = ['.', '../', '../common'] - obj.name = 'libingen_shared' - obj.target = 'ingen_shared' - obj.vnum = '0.0.0' - obj.inst_dir = bld.env()['LIBDIRNAME'] + obj.includes = ['.', '../', '../common'] + obj.name = 'libingen_shared' + obj.target = 'ingen_shared' + obj.vnum = '0.0.0' + obj.install_path = '${LIBDIR}' autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') -- cgit v1.2.1