dramatic overhaul of automation. too long to explain here. this work is not finished...
[ardour.git] / libs / ardour / wscript
index 0532619c81835c8e7aec65f9b9884dc6f8fe62d7..672dae6abd61a0598e567eda65b6915b84e630dd 100644 (file)
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
+from waflib import Options
 import os
-import glob
-import Options
 import re
 import subprocess
 
@@ -19,15 +18,16 @@ LIBARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 LIBARDOUR_LIB_VERSION = '3.0.0'
 
 # default state file version for this build
-CURRENT_SESSION_FILE_VERSION = 3000
+CURRENT_SESSION_FILE_VERSION = 3001
 
 # Variables for 'waf dist'
-APPNAME = 'libardour'
+APPNAME = 'libardour3'
 VERSION = LIBARDOUR_VERSION
+I18N_PACKAGE = 'libardour3'
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 path_prefix = 'libs/ardour/'
 
@@ -39,6 +39,7 @@ libardour_sources = [
         'audio_library.cc',
         'audio_playlist.cc',
         'audio_playlist_importer.cc',
+        'audio_playlist_source.cc',
         'audio_port.cc',
         'audio_region_importer.cc',
         'audio_track.cc',
@@ -54,6 +55,7 @@ libardour_sources = [
         'automation.cc',
         'automation_control.cc',
         'automation_list.cc',
+        'automation_watch.cc',
         'beats_frames_converter.cc',
         'broadcast_info.cc',
         'buffer.cc',
@@ -69,8 +71,8 @@ libardour_sources = [
         'config_text.cc',
         'control_protocol_manager.cc',
         'control_protocol_search_path.cc',
-        'crossfade.cc',
         'cycle_timer.cc',
+        'data_type.cc',
         'default_click.cc',
         'debug.cc',
         'delivery.cc',
@@ -88,6 +90,7 @@ libardour_sources = [
         'export_format_manager.cc',
         'export_format_specification.cc',
         'export_formats.cc',
+        'export_formats_search_path.cc',
         'export_graph_builder.cc',
         'export_handler.cc',
         'export_preset.cc',
@@ -99,11 +102,11 @@ libardour_sources = [
         'filesystem_paths.cc',
         'filter.cc',
         'find_session.cc',
-        'gain.cc',
         'globals.cc',
         'graph.cc',
         'graphnode.cc',
         'import.cc',
+        'instrument_info.cc',
         'internal_return.cc',
         'internal_send.cc',
         'interpolation.cc',
@@ -120,7 +123,9 @@ libardour_sources = [
         'midi_diskstream.cc',
         'midi_model.cc',
         'midi_patch_manager.cc',
+        'midi_patch_search_path.cc',
         'midi_playlist.cc',
+        'midi_playlist_source.cc',
         'midi_port.cc',
         'midi_region.cc',
         'midi_ring_buffer.cc',
@@ -134,7 +139,6 @@ libardour_sources = [
         'mtc_slave.cc',
         'mtdm.cc',
         'mute_master.cc',
-        'named_selection.cc',
         'onset_detector.cc',
         'operations.cc',
         'pan_controllable.cc',
@@ -147,6 +151,7 @@ libardour_sources = [
         'pi_controller.cc',
         'playlist.cc',
         'playlist_factory.cc',
+        'playlist_source.cc',
         'plugin.cc',
         'plugin_insert.cc',
         'plugin_manager.cc',
@@ -165,6 +170,7 @@ libardour_sources = [
         'return.cc',
         'reverse.cc',
         'route.cc',
+        'route_graph.cc',
         'route_group.cc',
         'route_group_member.cc',
         'rb_effect.cc',
@@ -188,7 +194,6 @@ libardour_sources = [
         'session_state_utils.cc',
         'session_time.cc',
         'session_transport.cc',
-        'session_utils.cc',
         'slave.cc',
         'smf_source.cc',
         'sndfile_helpers.cc',
@@ -210,183 +215,349 @@ libardour_sources = [
         'unknown_processor.cc',
         'user_bundle.cc',
         'utils.cc',
-        'version.cc'
+        'version.cc',
+        'worker.cc',
 ]
 
 def flac_supported():
-        cmd = subprocess.Popen ("sndfile-info testfile.flac", 
-                               stdout = subprocess.PIPE,
-                               stderr = subprocess.STDOUT, shell = True)
-        out = cmd.communicate()[0].decode('utf-8');
-        return re.search ('unknown format', out) == None
+    cmd = subprocess.Popen ("sndfile-info testfile.flac",
+                            stdout = subprocess.PIPE,
+                            stderr = subprocess.STDOUT, shell = True)
+    out = cmd.communicate()[0].decode('utf-8');
+    return re.search ('unknown format', out) == None
 
 def ogg_supported():
-        cmd = subprocess.Popen ("sndfile-info testfile.ogg", 
-                               stdout = subprocess.PIPE,
-                               stderr = subprocess.STDOUT, shell = True)
-        out = cmd.communicate()[0].decode('utf-8');
-        return re.search ('unknown format', out) == None
+    cmd = subprocess.Popen ("sndfile-info testfile.ogg",
+                            stdout = subprocess.PIPE,
+                            stderr = subprocess.STDOUT, shell = True)
+    out = cmd.communicate()[0].decode('utf-8');
+    return re.search ('unknown format', out) == None
 
-def set_options(opt):
-        autowaf.set_options(opt)
+def options(opt):
+    autowaf.set_options(opt)
 
 def configure(conf):
-        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', atleast_version='0.118.2')
-        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
-        autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0')
-        autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0')
-        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
-        autowaf.check_pkg(conf, 'slv2', uselib_store='SLV2', atleast_version='0.6.4', mandatory=False)
-        autowaf.check_pkg(conf, 'slv2', uselib_store='NEW_SLV2', atleast_version='0.7.0', mandatory=False)
-        autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL', atleast_version='0.9.14', mandatory=False)
-        autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', mandatory=False)
-        autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
-        autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
-        autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
-        autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
-
-        # we don't try to detect this, since its part of our source tree
-
-        conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-        conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
-
-        conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-
-        conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H')
-        conf.check(header_name='wordexp.h', define_name='HAVE_WORDEXP')
-
-        conf.check(header_name='jack/session.h', uselib = [ 'JACK' ], define_name='HAVE_JACK_SESSION')
-
-        conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
-        
-        conf.check_cc(fragment = "#include <jack/jack.h>\nvoid callback (int code, const char* reason, void* arg) { return; }\nint main(int argc, char **argv) { jack_client_t* c; jack_on_info_shutdown (c, callback, (void*) 0); return 0; }\n",
-                      uselib= [ 'JACK' ],
-                     msg = 'Checking for jack_on_info_shutdown',
-                      define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
-                     okmsg = 'present')
-
-        missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3\nCurrently this means using JACK version 0.120.1 from http://www.jackaudio.org/download\n'
-
-        conf.check_cc(fragment = "#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_t* p; jack_latency_range_t r; jack_port_set_latency_range (p, JackCaptureLatency, &r); return 0; }\n",
-                      uselib = [ 'JACK' ],
-                     msg = 'Checking for new JACK latency API',
-                     okmsg = 'present',
-                      mandatory = True,
-                      errmsg = missing_jack_message)
-
-        conf.check_cc(fragment = '#include <jack/jack.h>\nint main(int argc, char **argv) { jack_port_type_get_buffer_size ((jack_client_t*)0, ""); }\n',
-                      uselib = [ 'JACK' ],
-                     msg = 'Checking for new jack_port_type_get_buffer_size',
-                      okmsg = 'present',
-                      mandatory = True,
-                     errmsg = missing_jack_message)
-        
-        if flac_supported():
-               conf.define ('HAVE_FLAC', 1)
-        if ogg_supported():
-               conf.define ('HAVE_OGG', 1)
-
-        conf.write_config_header('libardour-config.h')
-
-        # Boost headers
-        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-        autowaf.check_header(conf, 'boost/weak_ptr.hpp')
-        autowaf.check_header(conf, 'boost/scoped_ptr.hpp')
-        autowaf.check_header(conf, 'boost/ptr_container/ptr_list.hpp')
+    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)
+    autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
+                      atleast_version='0.3.2')
+    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, 'lrdf', uselib_store='LRDF',
+                      atleast_version='0.4.0')
+    autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE',
+                      atleast_version='0.1.0')
+    autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
+                      atleast_version='2.0')
+    if Options.options.lv2:
+        autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
+                          atleast_version='1.0.0', mandatory=True)
+        autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
+                          atleast_version='0.14.0', mandatory=True)
+        autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+                          atleast_version='0.8.0', mandatory=True)
+        autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
+                          atleast_version='0.2.0', mandatory=True)
+        autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
+                          atleast_version='0.14.0', mandatory=True)
+        autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
+                          atleast_version='0.6.0', mandatory=False)
+        conf.define ('LV2_SUPPORT', 1)
+
+#    autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH',
+#                      mandatory=False)
+    autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT',
+                      atleast_version='1.12.0', mandatory=False)
+    autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
+    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC',
+                      atleast_version='1.2.1')
+    autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL',
+                      atleast_version='7.0.0')
+
+    # we don't try to detect this, since its part of our source tree
+
+    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
+    conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+
+    conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+
+    conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False)
+    conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False)
+
+    conf.check(header_name='jack/session.h', uselib = [ 'JACK' ],
+               define_name='HAVE_JACK_SESSION')
+
+    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
+
+    conf.check_cc(fragment = '''
+#include <jack/jack.h>
+void callback(jack_status_t code, const char* reason, void* arg) { return; }
+int main(int argc, char **argv) {
+    jack_client_t* c;
+    jack_on_info_shutdown(c, callback, (void*) 0);
+    return 0;
+}''',
+                  uselib= [ 'JACK' ],
+                  msg = 'Checking for jack_on_info_shutdown',
+                  define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
+                  okmsg = 'present')
+
+    missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3.'
+
+    conf.check_cc(fragment = '''
+#include <jack/jack.h>
+int main(int argc, char **argv) {
+    jack_port_t* p;
+    jack_latency_range_t r;
+    jack_port_set_latency_range(p, JackCaptureLatency, &r);
+    return 0;
+}''',
+                  uselib = [ 'JACK' ],
+                  msg = 'Checking for new JACK latency API',
+                  okmsg = 'present',
+                  mandatory = True,
+                  errmsg = missing_jack_message)
+
+    conf.check_cc(fragment = '''
+#include <jack/jack.h>
+int main(int argc, char **argv) {
+   jack_port_type_get_buffer_size((jack_client_t*)0, "");
+   return 0;
+}''',
+                  uselib = [ 'JACK' ],
+                  msg = 'Checking for new jack_port_type_get_buffer_size',
+                  okmsg = 'present',
+                  mandatory = True,
+                  errmsg = missing_jack_message)
+
+    if flac_supported():
+        conf.define ('HAVE_FLAC', 1)
+    if ogg_supported():
+        conf.define ('HAVE_OGG', 1)
+
+    conf.write_config_header('libardour-config.h', remove=False)
+
+    # Boost headers
+    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/scoped_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/ptr_container/ptr_list.hpp')
 
 
 def build(bld):
-        # Library
-        obj              = bld.new_task_gen('cxx', 'shlib')
-        obj.source       = libardour_sources
-        obj.export_incdirs = ['.']
-        obj.includes     = ['.', '../surfaces/control_protocol', '..']
-        obj.name         = 'libardour'
-        obj.target       = 'ardour'
-        obj.uselib       = 'GLIBMM GTHREAD AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF AUDIOUNIT OSX BOOST CURL DL'
-        obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libvampplugin libtaglib librubberband libaudiographer'
-        obj.vnum         = LIBARDOUR_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-        obj.cxxflags     = ['-DPACKAGE="libardour3"']
-        obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-        obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-        obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-        obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-                       os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-        obj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
-                       os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
-        obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
-
-        #obj.source += ' st_stretch.cc st_pitch.cc '
-        #obj.uselib += ' SOUNDTOUCH '
-        #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
-        
-        if bld.env['HAVE_SLV2']:
-               obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'lv2_pfile.c' ]
-               obj.uselib += ' SLV2 ' + ' RASQAL '
-               
-        if bld.env['VST_SUPPORT']:
-               obj.source += [ 'vst_plugin.cc', 'session_vst.cc' ]
-               obj.includes += [ '../fst' ]
-               obj.cxxflags += [ '-DVST_SUPPORT' ]
-
-        if bld.env['COREAUDIO']:
-               obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
-               obj.uselib_local += ' libappleutility'  
-               obj.source += [ 'audio_unit.cc' ]
+    # Library
+    obj              = bld(features = 'c cxx cshlib cxxshlib')
+    obj.source       = libardour_sources
+    obj.export_includes = ['.']
+    obj.includes     = ['.', '../surfaces/control_protocol', '..']
+    obj.name         = 'libardour'
+    obj.target       = 'ardour'
+    obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                        'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+                        'OSX','BOOST','CURL','DL']
+    obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
+                        'libvampplugin','libtaglib','librubberband',
+                        'libaudiographer']
+    obj.vnum         = LIBARDOUR_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.defines      = [
+        'PACKAGE="' + I18N_PACKAGE + '"',
+        'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+        'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+        'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
+        ]
+
+    #obj.source += ' st_stretch.cc st_pitch.cc '
+    #obj.uselib += ' SOUNDTOUCH '
+    #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
+
+    if bld.is_defined('HAVE_LILV') :
+        obj.source += ['lv2_plugin.cc', 'lv2_evbuf.c', 'uri_map.cc'] 
+        obj.uselib += ['LILV']
+        if bld.is_defined('HAVE_SUIL'):
+            obj.uselib += ['SUIL']
+
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
+        obj.source += [ 'windows_vst_plugin.cc']
+        obj.includes += [ '../fst' ]
+        obj.defines += [ 'WINDOWS_VST_SUPPORT' ]
 
+    if bld.is_defined('LXVST_SUPPORT'):
+        obj.source += [ 'lxvst_plugin.cc', 'linux_vst_support.cc', 'linux_vst_info_file.cc' ]
+        obj.defines += [ 'LXVST_SUPPORT' ]
+
+    if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'):
+        obj.source += [ 'session_vst.cc', 'vst_plugin.cc' ]
+
+    if bld.is_defined('HAVE_COREAUDIO'):
+        obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
+        obj.use    += ['libappleutility']
+
+    if bld.is_defined('AUDIOUNIT_SUPPORT'):
+        obj.source += [ 'audio_unit.cc' ]
+
+    if Options.options.fpu_optimization:
+        if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'):
+            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
+        elif bld.env['build_target'] == 'x86_64':
+            obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
+
+    # i18n
+    if bld.is_defined('ENABLE_NLS'):
+        mo_files = bld.path.ant_glob('po/*.mo')
+        for mo in mo_files:
+            lang = os.path.basename(mo.srcpath()).replace('.mo', '')
+            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                        lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+                           mo)
+
+    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+        # Unit tests
+        testobj              = bld(features = 'cxx cxxprogram')
+        testobj.source       = '''
+                test/dummy_lxvst.cc
+                test/test_util.cc
+                test/test_needing_session.cc
+                test/audio_region_test.cc
+                test/test_globals.cc
+                test/audio_region_read_test.cc
+                test/automation_list_property_test.cc
+                test/bbt_test.cc
+                test/tempo_test.cc
+                test/interpolation_test.cc
+                test/midi_clock_slave_test.cc
+                test/resampled_source_test.cc
+                test/framewalk_to_beats_test.cc
+                test/framepos_plus_beats_test.cc
+                test/framepos_minus_beats_test.cc
+                test/playlist_layering_test.cc
+                test/playlist_read_test.cc
+                test/playlist_equivalent_regions_test.cc
+                test/control_surfaces_test.cc
+                test/combine_regions_test.cc
+                test/region_naming_test.cc
+                test/load_sessions_test.cc
+                test/mtdm_test.cc
+                test/testrunner.cc
+        '''.split()
+
+# Tests that don't work
+#                test/mantis_3356_test.cc
+
+        testobj.includes     = obj.includes + ['test', '../pbd']
+        testobj.uselib       = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
+                                'SAMPLERATE','XML','LRDF','COREAUDIO']
+        testobj.use          = ['libpbd','libmidipp','libardour']
+        testobj.name         = 'libardour-tests'
+        testobj.target       = 'run-tests'
+        testobj.install_path = ''
+        testobj.defines      = [
+            'PACKAGE="libardour3test"',
+            'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+            'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+            'LOCALEDIR="' + os.path.join(
+                os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+            'VAMP_DIR="' + os.path.join(
+                os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
+            ]
         if bld.env['FPU_OPTIMIZATION']:
-               if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
-                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
-               elif bld.env['build_target'] == 'x86_64':
-                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
-
-        # i18n
-        if bld.env['ENABLE_NLS']:
-               mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
-               for mo in mo_files:
-                       lang = os.path.basename (mo).replace ('.mo', '')
-                       bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
-
-        if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
-               # Unit tests
-               testobj              = bld.new_task_gen('cxx', 'program')
-               testobj.source       = '''
-                       test/bbt_test.cpp
-                       test/interpolation_test.cpp
-                       test/midi_clock_slave_test.cpp
-                       test/resampled_source.cc
-                       test/mantis_3356.cc
-                       test/testrunner.cpp
-               '''.split()
-               testobj.includes     = obj.includes + ['test', '../pbd']
-               testobj.uselib       = 'CPPUNIT SIGCPP JACK GLIBMM GTHREAD SAMPLERATE XML LRDF COREAUDIO'
-               testobj.uselib_local = 'libpbd libmidipp libardour'
-               testobj.name         = 'libardour-tests'
-               testobj.target       = 'run-tests'
-               testobj.install_path = ''
-               testobj.cxxflags     = ['-DPACKAGE="libardour3test"']
-               testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-               testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-               testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-               testobj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-                               os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-               testobj.cxxflags     += ['-DVAMP_DIR="' + os.path.join(
-                               os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"']
-               if bld.env['FPU_OPTIMIZATION']:
-                       testobj.source += [ 'sse_functions_xmm.cc' ]
-                       if bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686':
-                               testobj.source += [ 'sse_functions.s' ]
-                       elif bld.env['build_target'] == 'x86_64':
-                               testobj.source += [ 'sse_functions_64bit.s' ]
+            testobj.source += [ 'sse_functions_xmm.cc' ]
+            if (bld.env['build_target'] == 'i386'
+                or bld.env['build_target'] == 'i686'):
+                testobj.source += [ 'sse_functions.s' ]
+            elif bld.env['build_target'] == 'x86_64':
+                testobj.source += [ 'sse_functions_64bit.s' ]
+
+        # Tester to just load a session
+        session_load_tester = bld(features = 'cxx cxxprogram')
+        session_load_tester.source = '''
+                    test/test_util.cc
+                    test/load_session.cc
+                    test/dummy_lxvst.cc
+            '''.split()
+
+        session_load_tester.includes  = obj.includes
+        session_load_tester.includes.append ('test')
+        session_load_tester.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
+                             'SAMPLERATE','XML','LRDF','COREAUDIO']
+        session_load_tester.use       = ['libpbd','libmidipp','libardour']
+        session_load_tester.name      = 'libardour-session-load-tester'
+        session_load_tester.target    = 'load-session'
+        session_load_tester.install_path = ''
+        session_load_tester.defines      = [
+            'PACKAGE="libardour3profile"',
+            'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+            'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+            'LOCALEDIR="' + os.path.join(
+                os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+            'VAMP_DIR="' + os.path.join(
+                os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
+            ]
+        if bld.env['FPU_OPTIMIZATION']:
+            session_load_tester.source += [ 'sse_functions_xmm.cc' ]
+            if (bld.env['build_target'] == 'i386'
+                or bld.env['build_target'] == 'i686'):
+                session_load_tester.source += [ 'sse_functions.s' ]
+            elif bld.env['build_target'] == 'x86_64':
+                session_load_tester.source += [ 'sse_functions_64bit.s' ]
+
+        # Profiling
+        for p in ['runpc', 'lots_of_regions', 'load_session']:
+            profilingobj = bld(features = 'cxx cxxprogram')
+            profilingobj.source = '''
+                    test/dummy_lxvst.cc
+                    test/test_util.cc
+            '''.split()
+
+            profilingobj.source.append('test/profiling/%s.cc' % p)
+
+            profilingobj.includes  = obj.includes
+            profilingobj.includes.append ('test')
+            profilingobj.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
+                             'SAMPLERATE','XML','LRDF','COREAUDIO']
+            profilingobj.use       = ['libpbd','libmidipp','libardour']
+            profilingobj.name      = 'libardour-profiling'
+            profilingobj.target    = p
+            profilingobj.install_path = ''
+            profilingobj.defines      = [
+                'PACKAGE="libardour3profile"',
+                'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+                'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+                'LOCALEDIR="' + os.path.join(
+                    os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+                'VAMP_DIR="' + os.path.join(
+                    os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
+                ]
+            if bld.env['FPU_OPTIMIZATION']:
+                profilingobj.source += [ 'sse_functions_xmm.cc' ]
+                if (bld.env['build_target'] == 'i386'
+                    or bld.env['build_target'] == 'i686'):
+                    profilingobj.source += [ 'sse_functions.s' ]
+                elif bld.env['build_target'] == 'x86_64':
+                    profilingobj.source += [ 'sse_functions_64bit.s' ]
 
 def shutdown():
-        autowaf.shutdown()
+    autowaf.shutdown()
 
 def i18n(bld):
-        autowaf.build_i18n (bld, '..', 'libs/ardour', APPNAME, libardour_sources)
+    autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+                       'Paul Davis')
+
+def i18n_pot(bld):
+    autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+                       'Paul Davis')
+
+def i18n_po(bld):
+    autowaf.build_i18n_po(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+                       'Paul Davis')
+
+def i18n_mo(bld):
+    autowaf.build_i18n_mo(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+                       'Paul Davis')