prepare for update to waf 1.8

uselib is no longer implicit (inherited by .use). This is still incomplete,
some uselibs for non-linux variants may be missing.

bld.is_defined("HAVE_XXX") also no longer works and will have to be
changed (I think to bld.env["HAVE_XXX"]) in countless places.

cfgtool/wscript

@@ -19,6 +19,6 @@ def build(bld):
     obj = bld (features = 'cxx c cxxprogram')
     obj.source       = 'cfgtool.cc'
     obj.target       = 'cfgtool'
-    obj.use          = [ 'libpbd', 'libardour', ]
+    obj.use          = [ 'libpbd', 'libardour' ]
-    obj.use          = [ 'libpbd', 'libardour', ]
+    obj.uselib       = [ 'GLIBMM', 'XML' ]
     obj.install_path = None

gtk2_ardour/wscript

@@ -479,7 +479,7 @@ def build(bld):
         ]
     obj.install_path = bld.env['DLLDIR']
     obj.linkflags    = ''
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB '
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML '
 
     if sys.platform == 'darwin':
         obj.uselib += ' AUDIOUNITS OSX '

headless/wscript

@@ -58,7 +58,7 @@ def build(bld):
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         ]
     obj.install_path = bld.env['LIBDIR']
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX LO '
     obj.uselib       += ' TAGLIB '

libs/ardour/wscript

@@ -362,7 +362,7 @@ def build(bld):
     obj.name         = 'libardour'
     obj.target       = 'ardour'
     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                        'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+                        'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'GIOMM',
                         'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
     obj.use          = ['libpbd','libmidipp','libevoral',
                         'libaudiographer',
@@ -448,6 +448,7 @@ def build(bld):
                 cxxflags = avx_cxxflags,
                 includes = [ '.' ],
                 use = [ 'libtimecode', 'libpbd', 'libevoral', 'liblua' ],
+                uselib = [ 'GLIBMM', 'XML' ],
                 target   = 'sse_avx_functions')
 
             obj.use += ['sse_avx_functions' ]

libs/ardouralsautil/wscript

@@ -34,7 +34,7 @@ def build(bld):
             obj.name     = 'ardouralsautil'
             obj.target   = 'ardouralsautil'
             obj.use      = 'libpbd'
-            obj.uselib   = [ 'ALSA' ]
+            obj.uselib   = [ 'ALSA', 'GLIBMM' ]
             obj.vnum     = '0.0.1'
             obj.install_path = os.path.join(bld.env['LIBDIR'])
 

libs/audiographer/wscript

@@ -85,7 +85,7 @@ def build(bld):
     audiographer.target         = 'audiographer'
     audiographer.export_includes = ['.', './src']
     audiographer.includes       = ['.', './src','../ardour','../timecode','../evoral']
-    audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK'
+    audiographer.uselib         = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK XML'
     audiographer.use            = 'libpbd'
     audiographer.vnum           = AUDIOGRAPHER_LIB_VERSION
     audiographer.install_path   = bld.env['LIBDIR']

libs/backends/alsa/wscript

@@ -29,7 +29,7 @@ def build(bld):
     obj.name     = 'alsa_audiobackend'
     obj.target   = 'alsa_audiobackend'
     obj.use      = 'libardour libpbd ardouralsautil'
-    obj.uselib   = 'ALSA'
+    obj.uselib   = 'ALSA GLIBMM XML'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'

libs/backends/coreaudio/wscript

@@ -29,6 +29,7 @@ def build(bld):
     obj.name     = 'coreaudio_backend'
     obj.target   = 'coreaudio_backend'
     obj.use      = 'libardour libpbd'
+    obj.uselib   = 'GLIBMM XML'
     obj.framework = [ 'CoreAudio', 'AudioToolbox', 'CoreServices' ]
     if bld.env['build_target'] not in [ 'lion' ] and (not bld.env['build_arch'] == "ppc"):
         obj.framework += [ 'CoreMidi' ]

libs/backends/dummy/wscript

@@ -25,6 +25,7 @@ def build(bld):
     obj.name     = 'dummy_audiobackend'
     obj.target   = 'dummy_audiobackend'
     obj.use      = 'libardour libpbd'
+    obj.uselib   = 'GLIBMM XML'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'

libs/backends/jack/wscript

@@ -108,6 +108,8 @@ def build(bld):
         obj.defines += [ 'USE_WEAK_JACK', 'HAVE_JACK_PORT_RENAME' ]
         obj.deps = [ 'weak_libjack.def' ]
 
+    obj.uselib   += [ 'GLIBMM', 'XML' ];
+
     #
     # device discovery code in the jack backend needs ALSA
     # on Linux.

libs/backends/portaudio/wscript

@@ -32,7 +32,7 @@ def build_portaudio (bld, name, defines):
     obj.name     = name
     obj.target   = name
     obj.use      = 'libardour libpbd'
-    obj.uselib   = ['PORTAUDIO']
+    obj.uselib   = 'PORTAUDIO GLIBMM XML'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS',

libs/canvas/wscript

@@ -84,7 +84,7 @@ def build(bld):
 
     obj.export_includes = ['.']
     obj.includes     = ['.']
-    obj.uselib       = 'SIGCPP CAIROMM GTKMM BOOST'
+    obj.uselib       = 'SIGCPP CAIROMM GTKMM BOOST XML'
     obj.use          = [ 'libpbd', 'libevoral', 'libardour', 'libgtkmm2ext', 'libevoral' ]
     obj.name         = 'libcanvas'
     obj.target       = 'canvas'
@@ -92,30 +92,9 @@ def build(bld):
     obj.install_path = bld.env['LIBDIR']
     obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
 
-    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+    # canvas unit-tests are outdated
-
+    if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
-            manual_tests              = '''
+            unit_testobj              = bld(features = 'cxx cxxprogram')
-                        test/hello_world.cc
-                        test/gtk_many.cc
-                        test/gtk_scene.cc
-                        test/gtk_movement.cc
-                        test/gtk_viewport.cc
-                        test/gtk_drag.cc
-                '''.split()
-
-            for t in manual_tests:
-                    target = t[:-3]
-                    name = t[t.find('/')+1:-3]
-                    manual_testobj = bld.new_task_gen('cxx', 'program')
-                    manual_testobj.source = t
-                    manual_testobj.includes = obj.includes + ['test', '../pbd']
-                    manual_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'
-                    manual_testobj.uselib_local = 'libcanvas libevoral libardour libgtkmm2ext'
-                    manual_testobj.name         = 'libcanvas-manual-test-%s' % name
-                    manual_testobj.target       = target
-                    manual_testobj.install_path = ''
-
-                    unit_testobj              = bld.new_task_gen('cxx', 'program')
             unit_testobj.source       = '''
                     test/group.cc
                     test/arrow.cc
@@ -137,9 +116,30 @@ def build(bld):
             unit_testobj.install_path = ''
             unit_testobj.cxxflags     = ['-DPACKAGE="libcanvastest"']
             unit_testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-                    unit_testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+            unit_testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFDIR']) + '"']
             unit_testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
 
+            manual_tests              = '''
+                        test/hello_world.cc
+                        test/gtk_many.cc
+                        test/gtk_scene.cc
+                        test/gtk_movement.cc
+                        test/gtk_viewport.cc
+                        test/gtk_drag.cc
+                '''.split()
+
+            for t in manual_tests:
+                    target = t[:-3]
+                    name = t[t.find('/')+1:-3]
+                    manual_testobj = bld(features = 'cxx cxxprogram')
+                    manual_testobj.source = t
+                    manual_testobj.includes = obj.includes + ['test', '../pbd']
+                    manual_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'
+                    manual_testobj.uselib_local = 'libcanvas libevoral libardour libgtkmm2ext'
+                    manual_testobj.name         = 'libcanvas-manual-test-%s' % name
+                    manual_testobj.target       = target
+                    manual_testobj.install_path = ''
+
             benchmarks = '''
                         benchmark/items_at_point.cc
                         benchmark/render_parts.cc
@@ -150,7 +150,7 @@ def build(bld):
             for t in benchmarks:
                     target = t[:-3]
                     name = t[t.find('/')+1:-3]
-                    manual_testobj = bld.new_task_gen('cxx', 'program')
+                    manual_testobj = bld(features = 'cxx cxxprogram')
                     manual_testobj.source = [ t, 'benchmark/benchmark.cc' ]
                     manual_testobj.includes = obj.includes + ['test', '../pbd']
                     manual_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'

libs/evoral/wscript

@@ -107,7 +107,7 @@ def build(bld):
     obj.includes       = ['.', './src']
     obj.name           = 'libevoral'
     obj.target         = 'evoral'
-    obj.uselib         = 'GLIBMM GTHREAD SMF'
+    obj.uselib         = 'GLIBMM GTHREAD SMF XML'
     obj.use            = 'libsmf libpbd'
     obj.vnum           = EVORAL_LIB_VERSION
     obj.install_path   = bld.env['LIBDIR']
@@ -122,7 +122,7 @@ def build(bld):
         obj.includes       = ['.', './src']
         obj.name           = 'libevoral_static'
         obj.target         = 'evoral_static'
-        obj.uselib         = 'GLIBMM GTHREAD SMF'
+        obj.uselib         = 'GLIBMM GTHREAD SMF XML'
         obj.use            = 'libsmf libpbd'
         obj.vnum           = EVORAL_LIB_VERSION
         obj.install_path   = ''

libs/gtkmm2ext/wscript

@@ -107,7 +107,7 @@ def build(bld):
     obj.includes     = ['.']
     obj.name         = 'libgtkmm2ext'
     obj.target       = 'gtkmm2ext'
-    obj.uselib       = 'GTKMM GTK'
+    obj.uselib       = 'GTKMM GTK XML'
     obj.use          = [ 'libpbd', 'libardour' ]
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']

libs/panners/1in2out/wscript

@@ -22,6 +22,7 @@ def build(bld):
     obj.name         = 'libardour_pan1in2out'
     obj.target       = 'pan1in2out'
     obj.use          = 'libardour libardour_cp libpbd'
+    obj.uselib       = 'GLIBMM XML'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():

libs/panners/2in2out/wscript

@@ -22,6 +22,7 @@ def build(bld):
     obj.name         = 'libardour_pan2in2out'
     obj.target       = 'pan2in2out'
     obj.use          = 'libardour libardour_cp libpbd'
+    obj.uselib       = 'GLIBMM XML'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():

libs/panners/stereobalance/wscript

@@ -22,6 +22,7 @@ def build(bld):
     obj.name         = 'libardour_panbalance'
     obj.target       = 'panbalance'
     obj.use          = 'libardour libardour_cp libpbd'
+    obj.uselib       = 'GLIBMM XML'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():

libs/panners/vbap/wscript

@@ -22,6 +22,7 @@ def build(bld):
     obj.name         = 'libardour_panvbap'
     obj.target       = 'panvbap'
     obj.use          = 'libardour libardour_cp libpbd'
+    obj.uselib       = 'GLIBMM XML'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():

libs/surfaces/control_protocol/wscript

@@ -33,6 +33,7 @@ def build(bld):
     obj.name         = 'libardour_cp'
     obj.target       = 'ardourcp'
     obj.use          = 'libardour'
+    obj.uselib       = 'GLIBMM SIGCPP XML'
     obj.install_path = bld.env['LIBDIR']
 
 def shutdown():

libs/surfaces/faderport/wscript

@@ -26,7 +26,7 @@ def build(bld):
     obj.includes     = [ '.', './faderport']
     obj.name         = 'libardour_faderport'
     obj.target       = 'ardour_faderport'
-    obj.uselib       = 'GTKMM GTK GDK'
+    obj.uselib       = 'GTKMM GTK GDK XML'
     obj.use          = 'libardour libardour_cp libgtkmm2ext libpbd'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 

libs/surfaces/generic_midi/wscript

@@ -29,7 +29,7 @@ def build(bld):
     obj.includes     = [ '.', './generic_midi']
     obj.name         = 'libardour_generic_midi'
     obj.target       = 'ardour_generic_midi'
-    obj.uselib       = 'GTKMM GTK GDK'
+    obj.uselib       = 'GTKMM GTK GDK XML'
     obj.use          = 'libardour libardour_cp libgtkmm2ext libpbd'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 

libs/surfaces/mackie/wscript

@@ -41,7 +41,7 @@ def build(bld):
     obj.includes     = [ '.' ]
     obj.name         = 'libardour_mcp'
     obj.target       = 'ardour_mcp'
-    obj.uselib       = 'GTKMM'
+    obj.uselib       = 'GTKMM XML'
     obj.use          = 'libardour libardour_cp libgtkmm2ext'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 

libs/vamp-plugins/wscript

@@ -54,7 +54,10 @@ def build(bld):
     obj.use          = 'libvampplugin libqmdsp'
     obj.defines      = [ 'ARDOUR_VAMP_PLUGINS_DLL_EPORTS' ]
     autowaf.ensure_visible_symbols (obj, True)
-    if bld.is_defined('HAVE_AUBIO'):
+    if bld.have_define('HAVE_AUBIO4'):
+        obj.source += ' Onset.cpp '
+        obj.uselib += ' AUBIO4 '
+    elif bld.have_define('HAVE_AUBIO'):
         obj.source += ' Onset.cpp '
         obj.uselib += ' AUBIO '
     obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION

session_utils/wscript

@@ -54,7 +54,7 @@ def build_ardour_util(bld, util):
         'PACKAGE="'    + "ARDOURUTILS" + '"',
         ]
     obj.install_path = bld.env['LIBDIR'] + '/utils'
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX LO '
     obj.uselib       += ' TAGLIB '

tools/luadevel/wscript

@@ -72,7 +72,7 @@ def build(bld):
         'PACKAGE="'    + "ARDOURUTILS" + '"',
         ]
 
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX LO '
     obj.uselib       += ' TAGLIB '