Remove use of waf compat15 tool.

Always load waf tools first (prevent smashing of --debug, DATADIR, etc).

git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 12af400800fb5e71886d2ae90f0540092cc8bb44..3f2c31e52ff6c3e620d150b190af4c72db9218ff 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
+from waflib import Options, TaskGen
 import waflib.Logs as Logs, waflib.Utils as Utils
 import os
-import Options
 import sys
-import TaskGen
 import re
 
 # Version of this package (even if built as a child)
@@ -238,12 +237,12 @@ def options(opt):
 
 def configure(conf):
     conf.load('misc')
+    conf.load('compiler_cxx')
     autowaf.build_version_files(
         path_prefix + 'version.h',
         path_prefix + 'version.cc',
         'gtk2_ardour', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
 
     if re.search ("linux", sys.platform) != None:
         autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
@@ -252,7 +251,7 @@ def configure(conf):
 
     autowaf.check_pkg(conf, 'flac', uselib_store='FLAC',
                       atleast_version='1.2.1')
-    autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD',
+    autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD',
                       atleast_version='2.10.1')
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK',
                       atleast_version='2.18')
@@ -269,7 +268,7 @@ def configure(conf):
     autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
 
 # Add a waf `feature' to allow compilation of things using winegcc
-from TaskGen import feature
+from waflib.TaskGen import feature
 @feature("wine")
 def set_winegcc(self):
     self.env.LINK_CXX = self.env.LINK_CC = 'wineg++'

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 45ef1a5ff87f407f27cf5287a1adc7587a828176..096a0bd20405450da58461b820e1c44c4e2bf589 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
+from waflib import Options
 import os
-import Options
 import re
 import subprocess
 
@@ -236,12 +236,13 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
+    conf.load('gas')
     autowaf.build_version_files(
         path_prefix + 'ardour/version.h',
         path_prefix + 'version.cc',
         'libardour3', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx gas')
     autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
                       atleast_version='0.3.2')
     autowaf.check_pkg(conf, 'jack', uselib_store='JACK',

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index 1c651e834aab14da354888659a377b88bc9677b9..996329777f0a911b317deee12762fe9d3e384c4d 100644 (file)
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -26,10 +26,9 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
 
-    conf.check_tool('compiler_cxx')
-
     autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0', mandatory=False)
     autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=False)
@@ -62,7 +61,7 @@ def build(bld):
             src/general/broadcast_info.cc
     '''
 
-    if bld.env['HAVE_SAMPLERATE']:
+    if bld.is_defined('HAVE_SAMPLERATE'):
         audiographer.source += '''
                 src/general/sr_converter.cc
         '''
@@ -77,7 +76,7 @@ def build(bld):
     audiographer.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 
-    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
         obj              = bld(features = 'cxx cxxprogram')
         obj.source       = '''
@@ -99,12 +98,12 @@ def build(bld):
                     tests/general/threader_test.cc
             '''
 
-        if bld.env['HAVE_SNDFILE']:
+        if bld.is_defined('HAVE_SNDFILE'):
             obj.source += '''
                     tests/sndfile/tmp_file_test.cc
             '''
 
-        if bld.env['HAVE_SAMPLERATE']:
+        if bld.is_defined('HAVE_SAMPLERATE'):
             obj.source += '''
                     tests/general/sr_converter_test.cc
             '''

diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
index d446275d492b678398396e06fb81c4b01f123d8c..77936ba12b7394a4ede231e40e9e96a38007c46a 100644 (file)
--- a/libs/clearlooks-newer/wscript
+++ b/libs/clearlooks-newer/wscript
@@ -12,8 +12,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_c')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cc')
 
 def build(bld):
     obj = bld(features = 'c cshlib')

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 24a5f4dd1fc120e16fc3d1062f18eb20826a71d9..11cb749a99a9fa0798352a0c1dd7784fd1a1138f 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 import os
 
 # Version of this package (even if built as a child)
@@ -28,10 +28,10 @@ def options(opt):
                     help="Build unit tests")
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
     #autowaf.display_header('Evoral Configuration')
 
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
     autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
     autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')

diff --git a/libs/gnomecanvas/wscript b/libs/gnomecanvas/wscript
index 64ade4a18999b762e456fe892a677d37b8de65cc..0ab45977b93f72c0365745eaa5e1229777dea679 100644 (file)
--- a/libs/gnomecanvas/wscript
+++ b/libs/gnomecanvas/wscript
@@ -45,8 +45,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_c')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cc')
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18')
     autowaf.check_pkg(conf, 'libart-2.0', uselib_store='LIBART', atleast_version='2.3')
 

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 3103ebd9b8926146102e08f1fd1ead008c1dc9ac..64f19e2d0275511035fbe0b5e4f6ec2393dbee51 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -68,10 +68,10 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc',
                     'libgtkmm2ext', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
 

diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index e4dbf1eab69c3304be5eab9fdec40a784d5148af..b810bdc80255d6ab8a1646252a297beac0ba14c8 100644 (file)
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -29,10 +29,10 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
                     'midipp', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')

diff --git a/libs/panners/wscript b/libs/panners/wscript
index 76f14e6fa1c1dd4565e76a9f950ce0ef7fe4e575..aec57eb40f35ad3fbfdfcf3f3256d46a180607b5 100644 (file)
--- a/libs/panners/wscript
+++ b/libs/panners/wscript
@@ -12,7 +12,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-    conf.sub_config(name)
+    conf.recurse(name)
     autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
@@ -24,4 +24,4 @@ def configure(conf):
 
 def build(bld):
     for i in panners:
-        bld.add_subdirs(i)
+        bld.recurse(i)

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index c2be9849a9ebe1439bcef4559cb920c9c77a5bdd..51dda6d7ce76f7d7a67209aa5b090e1a88b194b3 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
+from waflib import TaskGen
 import os
 import sys
-import TaskGen
 
 # Version of this package (even if built as a child)
 MAJOR = '4'
@@ -30,10 +30,10 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
                     'libpbd', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
     if sys.platform != 'darwin':

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index db759c69db4d3ce07318112376e3949a6840f2fb..fb25d6dbaf992e9dd2c19e962664b6fcfa043068 100644 (file)
--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/wscript
@@ -23,8 +23,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
 
 def build(bld):
     # Host Library

diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript
index 15fb9b2ade5fb0ce70b8b0dbea124019e93a4c22..7e9ca0250c3eb69bd08bd2709345187243829c2c 100644 (file)
--- a/libs/rubberband/wscript
+++ b/libs/rubberband/wscript
@@ -24,8 +24,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
 
 def build(bld):
     # Library

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 9f5c4749e7e85700a67921d189dca44ddd30b656..034b588248be74eb813db31e050bf0442e34ec13 100644 (file)
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 
 # Version of this package (even if built as a child)
 LIBSURFACES_VERSION = '4.1.0'
@@ -34,7 +34,7 @@ def options(opt):
     autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-    conf.sub_config(name)
+    conf.recurse(name)
     autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
@@ -64,9 +64,9 @@ def configure(conf):
         conf.define ('BUILD_WIIMOTE', 1)
 
 def build(bld):
-    bld.add_subdirs('control_protocol')
-    bld.add_subdirs('generic_midi')
-    bld.add_subdirs('mackie')
+    bld.recurse('control_protocol')
+    bld.recurse('generic_midi')
+    bld.recurse('mackie')
     if bld.env['BUILD_OSC']:
         bld.add_subdirs('osc')
     if bld.env['BUILD_POWERMATE']:

diff --git a/libs/taglib/wscript b/libs/taglib/wscript
index 986f8302abb0ae8351682236ca505345bafeb8f8..a6994d63911f76d46dacb532453573bf1e868579 100644 (file)
--- a/libs/taglib/wscript
+++ b/libs/taglib/wscript
@@ -24,8 +24,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
 
 def build(bld):
     # Library

diff --git a/libs/timecode/wscript b/libs/timecode/wscript
index f919649e2526b3e6e46714cdd0ff63a86a2e89b9..034292b1ddd01951e63a38583194cfeeec3c4606 100644 (file)
--- a/libs/timecode/wscript
+++ b/libs/timecode/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 import os
 
 # Version of this package (even if built as a child)
@@ -26,10 +26,9 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
 
-    conf.check_tool('compiler_cxx')
-
 def build(bld):
     # Library
     obj = bld(features = 'cxx cxxshlib')

diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 4ec6c198b3cf9fa7fecc2ae0ca99014f6acd349e..59823b0b2f9702a98dbaa60c9dd7b2d82dfb8d38 100644 (file)
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -23,8 +23,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
     autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', mandatory=False)
     conf.write_config_header('libvampplugins-config.h', remove=False)

diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript
index aabac61ea1201a344c9f639ab4b959ad7a520628..aa4dfdc1daadc4b0bf384ca4ea666ec89c264ebf 100644 (file)
--- a/libs/vamp-sdk/wscript
+++ b/libs/vamp-sdk/wscript
@@ -23,8 +23,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'fftw3', uselib_store='FFTW3', mandatory=True)
     autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True)
     conf.env.append_value('CXXFLAGS', '-DHAVE_FFTW3')

diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript
index fdfd7cfc2c8872f7bad0f184725938dc70475b37..6bb2274f3f9707e44371d83453cc423401005415 100644 (file)
--- a/tools/sanity_check/wscript
+++ b/tools/sanity_check/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 import os
 
 # Mandatory variables
@@ -11,8 +11,8 @@ def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.configure (conf)
-    conf.check_tool('compiler_cxx')
+    conf.load('compiler_cxx')
+    autowaf.configure(conf)
 
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')

diff --git a/waf b/waf
index c71880baa01c1c8fcc9285f95ca508f886e094c7..72d68665cce8503f16d75815a2409a761a457d5b 100755 (executable)
Binary files a/waf and b/waf differ

diff --git a/wscript b/wscript
index 0b4fd562825088da76af8c552f2dcf192ae8fbd8..3e39f8992ba03c88e40c571ee720f466fa9fffde 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 import os
 import re
 import string
@@ -404,10 +404,10 @@ def options(opt):
     opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm',
                     help='Do not ask questions that require confirmation during the build')
     for i in children:
-        opt.sub_options(i)
+        opt.recurse(i)
 
 def sub_config_and_use(conf, name, has_objects = True):
-    conf.sub_config(name)
+    conf.recurse(name)
     autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
@@ -583,26 +583,26 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Strict compiler flags', conf.env['STRICT'])
 
     write_config_text('Architecture flags',    opts.arch)
-    write_config_text('Aubio',                 bool(conf.env['HAVE_AUBIO']))
+    write_config_text('Aubio',                 conf.is_defined('HAVE_AUBIO'))
     write_config_text('Build target',          conf.env['build_target'])
-    write_config_text('CoreAudio',             bool(conf.env['HAVE_COREAUDIO']))
-    write_config_text('FLAC',                  bool(conf.env['HAVE_FLAC']))
+    write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
+    write_config_text('FLAC',                  conf.is_defined('HAVE_FLAC'))
     write_config_text('FPU optimization',      opts.fpu_optimization)
     write_config_text('Freedesktop files',     opts.freedesktop)
     write_config_text('Freesound',             opts.freesound)
-    write_config_text('JACK session support',  bool(conf.env['JACK_SESSION']))
-    write_config_text('LV2 UI embedding',      bool(conf.env['HAVE_SUIL']))
-    write_config_text('LV2 support',           bool(conf.env['LV2_SUPPORT']))
-    write_config_text('LXVST support',         bool(conf.env['LXVST_SUPPORT']))
-    write_config_text('OGG',                   bool(conf.env['HAVE_OGG']))
-    write_config_text('Phone home',            bool(conf.env['PHONE_HOME']))
+    write_config_text('JACK session support',  conf.is_defined('JACK_SESSION'))
+    write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
+    write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
+    write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))
+    write_config_text('OGG',                   conf.is_defined('HAVE_OGG'))
+    write_config_text('Phone home',            conf.is_defined('PHONE_HOME'))
     write_config_text('Program name',          opts.program_name)
-    write_config_text('Rubberband',            bool(conf.env['HAVE_RUBBERBAND']))
-    write_config_text('Samplerate',            bool(conf.env['HAVE_SAMPLERATE']))
-    write_config_text('Soundtouch',            bool(conf.env['HAVE_SOUNDTOUCH']))
+    write_config_text('Rubberband',            conf.is_defined('HAVE_RUBBERBAND'))
+    write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
+    write_config_text('Soundtouch',            conf.is_defined('HAVE_SOUNDTOUCH'))
     write_config_text('Translation',           opts.nls)
     write_config_text('Tranzport',             opts.tranzport)
-    write_config_text('Unit tests',            bool(conf.env['BUILD_TESTS']))
+    write_config_text('Unit tests',            conf.is_defined('BUILD_TESTS'))
     write_config_text('Universal binary',      opts.universal)
     write_config_text('VST support',           opts.vst)
     write_config_text('Wiimote support',       opts.wiimote)
@@ -632,7 +632,7 @@ def build(bld):
     if sys.platform == 'darwin':
         bld.add_subdirs('libs/appleutility')
     for i in children:
-        bld.add_subdirs(i)
+        bld.recurse(i)
 
     # ideally, we'd like to use the OS-provided MIDI API
     # for default ports. that doesn't work on at least