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

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++'

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',

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
             '''

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')

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')

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')
 

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')
 

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')

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)

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':

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

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

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.recurse('control_protocol')
-    bld.add_subdirs('generic_midi')
+    bld.recurse('generic_midi')
-    bld.add_subdirs('mackie')
+    bld.recurse('mackie')
     if bld.env['BUILD_OSC']:
         bld.add_subdirs('osc')
     if bld.env['BUILD_POWERMATE']:

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

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')

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)

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')

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.load('compiler_cxx')
-    conf.check_tool('compiler_cxx')
+    autowaf.configure(conf)
 
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')

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('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
-    write_config_text('FLAC',                  bool(conf.env['HAVE_FLAC']))
+    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('JACK session support',  conf.is_defined('JACK_SESSION'))
-    write_config_text('LV2 UI embedding',      bool(conf.env['HAVE_SUIL']))
+    write_config_text('LV2 UI embedding',      conf.is_defined('HAVE_SUIL'))
-    write_config_text('LV2 support',           bool(conf.env['LV2_SUPPORT']))
+    write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
-    write_config_text('LXVST support',         bool(conf.env['LXVST_SUPPORT']))
+    write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))
-    write_config_text('OGG',                   bool(conf.env['HAVE_OGG']))
+    write_config_text('OGG',                   conf.is_defined('HAVE_OGG'))
-    write_config_text('Phone home',            bool(conf.env['PHONE_HOME']))
+    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('Rubberband',            conf.is_defined('HAVE_RUBBERBAND'))
-    write_config_text('Samplerate',            bool(conf.env['HAVE_SAMPLERATE']))
+    write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
-    write_config_text('Soundtouch',            bool(conf.env['HAVE_SOUNDTOUCH']))
+    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