summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/wscript11
-rw-r--r--src/engine/NodeFactory.cpp10
-rw-r--r--src/engine/NodeFactory.hpp2
-rw-r--r--src/engine/wscript40
-rw-r--r--src/gui/wscript11
-rw-r--r--src/ingen/wscript8
-rw-r--r--src/module/wscript5
-rw-r--r--src/serialisation/wscript5
-rw-r--r--src/shared/wscript17
-rw-r--r--wscript42
10 files changed, 71 insertions, 80 deletions
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<LADSPAPlugin*>(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')
diff --git a/wscript b/wscript
index f17196c7..ed0147f5 100644
--- a/wscript
+++ b/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import os
-import Params
import autowaf
+import Options
# Version of this package (even if built as a child)
INGEN_VERSION = '0.5.1'
@@ -36,17 +36,16 @@ def configure(conf):
autowaf.check_pkg(conf, 'libxml-2.0', destvar='XML2', vnum='2.6.0', mandatory=False)
autowaf.check_pkg(conf, 'libglademm-2.4', destvar='GLADEMM', vnum='2.6.0', mandatory=False)
autowaf.check_pkg(conf, 'libsoup-2.4', destvar='SOUP', vnum='2.4.0', mandatory=False)
- autowaf.check_header(conf, 'ladspa.h', 'HAVE_LADSPA', mandatory=False)
- if not Params.g_options.no_liblo:
+ autowaf.check_header(conf, 'ladspa.h', 'HAVE_LADSPA_H', mandatory=False)
+ if not Options.options.no_liblo:
autowaf.check_pkg(conf, 'liblo', destvar='LIBLO', vnum='0.25', mandatory=False)
autowaf.check_pkg(conf, 'redlandmm', destvar='REDLANDMM', vnum='0.0.0', mandatory=False)
# Check for posix_memalign (OSX, amazingly, doesn't have it)
- fe = conf.create_function_enumerator()
- fe.headers = ['stdlib.h']
- fe.function = 'posix_memalign'
- fe.define = 'HAVE_POSIX_MEMALIGN'
- fe.run()
+ conf.check(
+ function_name='posix_memalign',
+ header_name='stdlib.h',
+ define_name='HAVE_POSIX_MEMALIGN')
build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1
@@ -68,18 +67,18 @@ def configure(conf):
autowaf.print_summary(conf)
autowaf.display_header('Ingen Configuration')
- autowaf.display_msg("Jack", str(conf.env['HAVE_JACK'] == 1), 'YELLOW')
- autowaf.display_msg("OSC", str(conf.env['HAVE_LIBLO'] == 1), 'YELLOW')
- autowaf.display_msg("HTTP", str(conf.env['HAVE_SOUP'] == 1), 'YELLOW')
- autowaf.display_msg("LV2", str(conf.env['HAVE_SLV2'] == 1), 'YELLOW')
- autowaf.display_msg("LADSPA", str(conf.env['HAVE_LADSPA'] == 1), 'YELLOW')
- autowaf.display_msg("Build GUI", str(conf.env['BUILD_GUI'] == 1), 'YELLOW')
+ autowaf.display_msg(conf, "Jack", str(conf.env['HAVE_JACK'] == 1))
+ autowaf.display_msg(conf, "OSC", str(conf.env['HAVE_LIBLO'] == 1))
+ autowaf.display_msg(conf, "HTTP", str(conf.env['HAVE_SOUP'] == 1))
+ autowaf.display_msg(conf, "LV2", str(conf.env['HAVE_SLV2'] == 1))
+ autowaf.display_msg(conf, "LADSPA", str(conf.env['HAVE_LADSPA_H'] == 1))
+ autowaf.display_msg(conf, "Build GUI", str(conf.env['BUILD_GUI'] == 1))
print
def build(bld):
- opts = Params.g_options
- opts.datadir = opts.datadir or bld.env()['PREFIX'] + 'share'
- opts.moduledir = opts.moduledir or bld.env()['PREFIX'] + 'lib/ingen'
+ opts = Options.options
+ opts.datadir = opts.datadir or bld.env['PREFIX'] + 'share'
+ opts.moduledir = opts.moduledir or bld.env['PREFIX'] + 'lib/ingen'
# Modules
bld.add_subdirs('src/engine')
@@ -88,7 +87,7 @@ def build(bld):
bld.add_subdirs('src/shared')
bld.add_subdirs('src/client')
- if bld.env()['BUILD_GUI']:
+ if bld.env['BUILD_GUI']:
bld.add_subdirs('src/gui')
# Program
@@ -96,13 +95,12 @@ def build(bld):
# Documentation
autowaf.build_dox(bld, 'INGEN', INGEN_VERSION, srcdir, blddir)
- install_files('HTMLDIR', '', blddir + '/default/doc/html/*')
+ bld.install_files('${HTMLDIR}', blddir + '/default/doc/html/*')
# Icons
icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48']
for s in icon_sizes:
- install_as(
- os.path.normpath(bld.env()['DATADIR'] + '/icons/hicolor/' + s + '/apps/'),
- 'ingen.png',
+ bld.install_as(
+ os.path.normpath(bld.env['DATADIR'] + '/icons/hicolor/' + s + '/apps/ingen.png'),
'icons/' + s + '/ingen.png')
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 01:43:36 +0000