diff options
| l--------- | INSTALL | 1 | ||||
| -rw-r--r-- | src/client/wscript | 2 | ||||
| -rw-r--r-- | src/engine/wscript | 10 | ||||
| -rw-r--r-- | src/gui/wscript | 4 | ||||
| -rw-r--r-- | src/ingen/wscript | 2 | ||||
| -rw-r--r-- | src/module/wscript | 2 | ||||
| -rw-r--r-- | src/serialisation/wscript | 2 | ||||
| -rw-r--r-- | src/shared/wscript | 2 | ||||
| l--------- | waf | 1 | ||||
| -rw-r--r-- | wscript | 36 |
10 files changed, 31 insertions, 31 deletions
diff --git a/INSTALL b/INSTALL deleted file mode 120000 index 4d35fcc7..00000000 --- a/INSTALL +++ /dev/null @@ -1 +0,0 @@ -autowaf/INSTALL
\ No newline at end of file diff --git a/src/client/wscript b/src/client/wscript index 8a4540d0..a5120d13 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers diff --git a/src/engine/wscript b/src/engine/wscript index 0cbd060c..47a55079 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers @@ -59,7 +59,7 @@ def build(bld): internals/Trigger.cpp ''' - if bld.env['HAVE_SLV2'] == 1: + if bld.is_defined('HAVE_SLV2'): core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp ' obj = bld(features = 'cxx cxxshlib') @@ -73,7 +73,7 @@ def build(bld): core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL SORD' autowaf.use_lib(bld, obj, core_libs) - if bld.env['HAVE_SOUP'] == 1: + if bld.is_defined('HAVE_SOUP'): obj = bld(features = 'cxx cxxshlib') obj.source = ''' EventSource.cpp @@ -88,7 +88,7 @@ def build(bld): obj.install_path = '${LIBDIR}' autowaf.use_lib(bld, obj, core_libs + ' SOUP') - if bld.env['HAVE_LIBLO'] == 1: + if bld.is_defined('HAVE_LIBLO'): obj = bld(features = 'cxx cxxshlib') obj.source = ''' EventSource.cpp @@ -104,7 +104,7 @@ def build(bld): obj.install_path = '${LIBDIR}' autowaf.use_lib(bld, obj, core_libs + ' LIBLO') - if bld.env['HAVE_JACK'] == 1: + if bld.is_defined('HAVE_JACK'): obj = bld(features = 'cxx cxxshlib') obj.source = 'JackDriver.cpp ingen_jack.cpp' obj.export_includes = ['.'] diff --git a/src/gui/wscript b/src/gui/wscript index c6cc4e7a..226a0d08 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -1,6 +1,6 @@ #!/usr/bin/env python -import autowaf -import Utils +from waflib.extras import autowaf as autowaf +import waflib.Utils as Utils def build(bld): # Headers diff --git a/src/ingen/wscript b/src/ingen/wscript index 08d793eb..56b1b3dd 100644 --- a/src/ingen/wscript +++ b/src/ingen/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): obj = bld(features = 'c cxx cxxprogram') diff --git a/src/module/wscript b/src/module/wscript index 41cc752b..20ef57ef 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers diff --git a/src/serialisation/wscript b/src/serialisation/wscript index 4e38bed5..54ec7228 100644 --- a/src/serialisation/wscript +++ b/src/serialisation/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers diff --git a/src/shared/wscript b/src/shared/wscript index 07a851bb..067c1335 100644 --- a/src/shared/wscript +++ b/src/shared/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): # Headers @@ -1 +0,0 @@ -autowaf/waf
\ No newline at end of file @@ -1,7 +1,8 @@ #!/usr/bin/env python import os -import autowaf -import Options + +import waflib.Options as Options +from waflib.extras import autowaf as autowaf # Version of this package (even if built as a child) INGEN_VERSION = '0.5.1' @@ -36,7 +37,7 @@ def configure(conf): conf.line_just = max(conf.line_just, 67) autowaf.configure(conf) autowaf.display_header('Ingen Configuration') - conf.check_tool('compiler_cxx') + conf.load('compiler_cxx') autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -66,7 +67,7 @@ def configure(conf): autowaf.check_pkg(conf, 'liblo', uselib_store='LIBLO', atleast_version='0.25', mandatory=False) if not Options.options.no_jack_session: - if conf.env['HAVE_NEW_JACK']: + if conf.is_defined('HAVE_NEW_JACK'): autowaf.define(conf, 'INGEN_JACK_SESSION', 1) # Check for posix_memalign (OSX, amazingly, doesn't have it) @@ -84,11 +85,12 @@ def configure(conf): autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h') autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h') - build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1 + build_gui = conf.is_defined('HAVE_GLADEMM') and conf.is_defined('HAVE_FLOWCANVAS') autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION) autowaf.define(conf, 'INGEN_BUILD_GUI', int(build_gui)) - autowaf.define(conf, 'HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1)) + if conf.is_defined('HAVE_JACK'): + autowaf.define(conf, 'HAVE_JACK_MIDI', 1) if conf.env['BUNDLE']: autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIRNAME'], 'ingen')) autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIRNAME']) @@ -104,12 +106,12 @@ def configure(conf): conf.write_config_header('ingen-config.h', remove=False) - autowaf.display_msg(conf, "Jack", str(conf.env['HAVE_JACK'] == 1)) + autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK')) autowaf.display_msg(conf, "Jack session support", - str(conf.env['INGEN_JACK_SESSION'] == 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)) + conf.is_defined('INGEN_JACK_SESSION')) + autowaf.display_msg(conf, "OSC", conf.is_defined('HAVE_LIBLO')) + autowaf.display_msg(conf, "HTTP", conf.is_defined('HAVE_SOUP')) + autowaf.display_msg(conf, "LV2", conf.is_defined('HAVE_SLV2')) autowaf.display_msg(conf, "GUI", str(conf.env['INGEN_BUILD_GUI'] == 1)) print('') @@ -123,14 +125,14 @@ def build(bld): bld.path.ant_glob('src/common/interface/*.hpp')) # Modules - bld.add_subdirs('src/engine') - bld.add_subdirs('src/serialisation') - bld.add_subdirs('src/module') - bld.add_subdirs('src/shared') - bld.add_subdirs('src/client') + bld.recurse('src/engine') + bld.recurse('src/serialisation') + bld.recurse('src/module') + bld.recurse('src/shared') + bld.recurse('src/client') if bld.env['INGEN_BUILD_GUI']: - bld.add_subdirs('src/gui') + bld.recurse('src/gui') # Program obj = bld(features = 'c cxx cxxprogram') |