Merge branch 'master' into cairocanvas
[ardour.git] / gtk2_ardour / wscript
index dd7d2f544b604eacefa29608204079a479e035f0..90417bf2c18bb61201e5a784d798e3828c47d5b8 100644 (file)
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
+from waflib import Options, TaskGen
+import waflib.Logs as Logs, waflib.Utils as Utils
 import os
-import glob
-import Options
 import sys
-import TaskGen
 import re
+import time
+from waflib.Task import Task
 
 # Version of this package (even if built as a child)
 MAJOR = '3'
@@ -14,22 +15,23 @@ MICRO = '0'
 GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 
 # Variables for 'waf dist'
-APPNAME = 'gtk2_ardour'
+APPNAME = 'gtk2_ardour3'
 VERSION = GTK2_ARDOUR_VERSION
+I18N_PACKAGE = 'gtk2_ardour3'
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 path_prefix = 'gtk2_ardour/'
 
 gtk2_ardour_sources = [
         'about.cc',
         'actions.cc',
-        'add_midi_cc_track_dialog.cc',
         'add_route_dialog.cc',
         'ambiguous_file_dialog.cc',
         'analysis_window.cc',
+        'ardour_button.cc',
         'ardour_dialog.cc',
         'ardour_ui.cc',
         'ardour_ui2.cc',
@@ -38,6 +40,7 @@ gtk2_ardour_sources = [
         'ardour_ui_ed.cc',
         'ardour_ui_mixer.cc',
         'ardour_ui_options.cc',
+        'ardour_window.cc',
         'audio_clock.cc',
         'audio_region_editor.cc',
         'audio_region_view.cc',
@@ -50,25 +53,13 @@ gtk2_ardour_sources = [
         'automation_time_axis.cc',
         'axis_view.cc',
         'bundle_manager.cc',
-        'cairo_widget.cc',
-        'canvas-flag.cc',
-        'canvas-hit.cc',
-        'canvas-note-event.cc',
-        'canvas-note.cc',
-        'canvas_patch_change.cc',
-        'canvas-simpleline.c',
-        'canvas-simplerect.c',
-        'canvas-sysex.cc',
-        'canvas-waveview.c',
+        'button_joiner.cc',
         'clock_group.cc',
         'configinfo.cc',
         'control_point.cc',
         'control_point_dialog.cc',
-        'crossfade_edit.cc',
-        'crossfade_view.cc',
         'curvetest.cc',
         'debug.cc',
-        'diamond.cc',
         'edit_note_dialog.cc',
         'editing.cc',
         'editor.cc',
@@ -88,12 +79,10 @@ gtk2_ardour_sources = [
         'editor_markers.cc',
         'editor_mixer.cc',
         'editor_mouse.cc',
-        'editor_nudge.cc',
         'editor_ops.cc',
         'editor_regions.cc',
         'editor_routes.cc',
         'editor_rulers.cc',
-        'editor_scrub.cc',
         'editor_selection.cc',
         'editor_snapshots.cc',
         'editor_summary.cc',
@@ -124,43 +113,57 @@ gtk2_ardour_sources = [
         'insert_time_dialog.cc',
         'interthread_progress_window.cc',
         'io_selector.cc',
+        'hit.cc',
         'keyboard.cc',
         'keyeditor.cc',
         'latency_gui.cc',
         'led.cc',
         'level_meter.cc',
-        'lineset.cc',
         'location_ui.cc',
         'main.cc',
+        'main_clock.cc',
         'marker.cc',
         'midi_automation_line.cc',
         'midi_channel_dialog.cc',
         'midi_channel_selector.cc',
         'midi_cut_buffer.cc',
+        'midi_export_dialog.cc',
         'midi_list_editor.cc',
         'midi_port_dialog.cc',
         'midi_region_view.cc',
         'midi_scroomer.cc',
+        'midi_selection.cc',
         'midi_streamview.cc',
         'midi_time_axis.cc',
         'midi_tracer.cc',
+        'midi_velocity_dialog.cc',
         'missing_file_dialog.cc',
         'missing_plugin_dialog.cc',
+        'mixer_actor.cc',
         'mixer_group_tabs.cc',
         'mixer_strip.cc',
         'mixer_ui.cc',
         'monitor_section.cc',
         'mono_panner.cc',
+        'mono_panner_editor.cc',
         'mouse_cursors.cc',
         'nag.cc',
         'new_plugin_preset_dialog.cc',
         'normalize_dialog.cc',
+        'note.cc',
+        'note_base.cc',
         'note_player.cc',
+        'nsm.cc',
+        'nsmclient.cc',
         'option_editor.cc',
         'opts.cc',
         'panner2d.cc',
+        'panner_editor.cc',
+        'panner_interface.cc',
         'panner_ui.cc',
+        'patch_change.cc',
         'piano_roll_header.cc',
+        'pingback.cc',
         'playlist_selector.cc',
         'plugin_eq_gui.cc',
         'plugin_selector.cc',
@@ -202,16 +205,16 @@ gtk2_ardour_sources = [
         'session_option_editor.cc',
         'sfdb_ui.cc',
         'shuttle_control.cc',
-        'simpleline.cc',
-        'simplerect.cc',
         'splash.cc',
         'speaker_dialog.cc',
         'startup.cc',
         'step_editor.cc',
         'step_entry.cc',
         'stereo_panner.cc',
+        'stereo_panner_editor.cc',
         'streamview.cc',
         'strip_silence_dialog.cc',
+        'sys_ex.cc',
         'tape_region_view.cc',
         'tempo_dialog.cc',
         'tempo_lines.cc',
@@ -228,21 +231,35 @@ gtk2_ardour_sources = [
         'utils.cc',
         'verbose_cursor.cc',
         'version.cc',
+        'visibility_group.cc',
         'volume_controller.cc',
-        'waveview.cc',
-        'window_proxy.cc'
+        'window_proxy.cc',
+# video-timeline related sources:
+        'video_image_frame.cc',
+        'add_video_dialog.cc',
+        'editor_videotimeline.cc',
+        'video_timeline.cc',
+        'system_exec.cc',
+        'video_monitor.cc',
+        'transcode_ffmpeg.cc',
+        'transcode_video_dialog.cc',
+        'video_server_dialog.cc',
+        'utils_videotl.cc',
+        'export_video_dialog.cc',
+        'export_video_infobox.cc'
 ]
 
-def set_options(opt):
+def options(opt):
     autowaf.set_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')
@@ -251,31 +268,71 @@ 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')
     autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
                       atleast_version='2.18')
-    autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6',
-                      uselib_store='GNOMECANVASMM', atleast_version='2.16')
     autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
+    autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False)
+    autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG')
 
-    conf.check_tool('misc') # subst tool
-
-    conf.write_config_header('gtk2ardour-config.h')
+    conf.write_config_header('gtk2ardour-config.h', remove=False)
 
     # Boost headers
-    autowaf.check_header(conf, 'boost/shared_ptr.hpp')
-    autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+    autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
+    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++'
     self.env.CC = 'winegcc'
 
+def _doPyp(infileName, deps = False):
+    outStr = ''
+    out = []
+    re_spaces = re.compile("\s+")
+
+    if infileName == '-':
+        fd = sys.stdin
+    else:
+        fd = open(infileName)
+    inLines = fd.readlines()
+    if fd != sys.stdin:
+        fd.close()
+        
+
+    for line in inLines:
+        bits = re_spaces.split(line)
+        if bits[0] == '##include':
+            incName = bits[1]
+            if (deps):
+                out += [ incName ]
+            else:
+                # assume included file comes from same place as source file
+                incName = os.path.join (os.path.dirname (infileName), incName);
+                outStr += _doPyp(incName)
+        else:
+            if not deps:
+                outStr += line
+
+    # done
+    if deps:
+        return out
+    else:
+        return outStr
+
+def include_processor(task):
+    infileName = task.inputs[0].srcpath()
+    outfileName = os.path.join(out, task.outputs[0].bldpath())
+    fdOut = open (outfileName, "w")
+    fdOut.write (_doPyp(infileName))
+    fdOut.close ()
+
+
 def build_color_scheme(path, prefix):
     f = open (path, 'r')
     color_scheme = ''
@@ -293,114 +350,152 @@ def build_color_scheme(path, prefix):
     f.close()
     return color_scheme
 
-
 def build(bld):
-    # GTK front-end; if we're using VST we build this as a shared library,
-    # otherwise it's a normal executabale
-    if bld.env['VST_SUPPORT']:
-        obj = bld.new_task_gen(features = 'cxx cc cshlib')
-    else:
-        obj = bld.new_task_gen(features = 'cxx cc cprogram')
-
-    obj.includes     = ['.']
-    obj.source       = gtk2_ardour_sources
-    obj.name         = 'gtk2_ardour'
-    obj.linkflags    = []
-    if bld.env['VST_SUPPORT']:
-        obj.target = 'gtk2_ardour'
-        obj.includes += ['../libs/fst']
+
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
+        # If we require VST support we build a stub main() and the FST library
+        # here using winegcc, and link it to the GTK front-end library
+        obj = bld(features = 'cxx c cxxprogram wine')
+        obj.source = '''
+                ../libs/fst/fst.c
+                ../libs/fst/fstinfofile.c
+                ../libs/fst/vsti.c
+                ../libs/fst/vstwin.c
+                ../vst/winmain.c
+        '''
+        obj.uselib = 'ALSA'
+        obj.use          = [ 'libpbd',
+                             'libmidipp',
+                             'libtaglib',
+                             'libardour',
+                             'libardour_cp',
+                             'libgtk2_ardour',
+                             'libgtkmm2ext',
+                             'libtaglib',
+                             'libcanvas'
+                             ]
+        obj.target = 'ardour-3.0-vst.exe.so'
+        obj.includes  = [ '../libs/fst', '.' ]
+        obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+        obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
+        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+        # end of the wine executable
+
+        # now the shared library containing the GTK GUI for ardour
+        obj = bld (features = 'cxx c cxxshlib')
+        obj.source    = gtk2_ardour_sources
+        obj.includes  = [ '../libs/fst', '.' ]
+        obj.name      = 'libgtk2_ardour'
+        obj.target    = 'gtk2_ardour'
     else:
+        # just the normal executable version of the GTK GUI
+        obj = bld(features = 'cxx c cxxprogram')
+        obj.source    = gtk2_ardour_sources
         obj.target = 'ardour-3.0'
+        obj.includes = ['.']
+
+    # continue with setup of obj, which could be a shared library
+    # or an executable.
+
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL'
-    obj.uselib       += ' GTKMM GNOMECANVASMM '
-    obj.uselib       += ' AUDIOUNITS OSX GTKOSX '
-    obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp
-                          libgtkmm2ext libtaglib libgnomecanvas-2'''
+
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL GTKMM LO'
+    obj.use          = [ 'libpbd',
+                         'libmidipp',
+                         'libtaglib',
+                         'libardour',
+                         'libardour_cp',
+                         'libgtkmm2ext',
+                         'libtaglib',
+                         'libcanvas'
+                         ]
     if sys.platform == 'darwin':
-        obj.uselib_local + ' libappleutility'
+        obj.uselib += ' AUDIOUNITS OSX GTKOSX'
+        obj.use    += ' libappleutility'
     obj.defines     = [
-        'PACKAGE="gtk2_ardour"',
+        'PACKAGE="' + I18N_PACKAGE + '"',
         'VERSIONSTRING="' + bld.env['VERSION'] + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
-        'CONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"',
-        'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"',
-        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']),
-                                     'locale') + '"',
+        '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.includes += ['../libs']
 
-    if bld.env['HAVE_SUIL']:
+    if bld.is_defined('HAVE_SUIL'):
         obj.source += [ 'lv2_plugin_ui.cc' ]
-        obj.uselib += ' SUIL '
-    elif bld.env['HAVE_SLV2']:
-        obj.source += [ 'lv2_plugin_ui.cc' ]
-        obj.uselib += ' SLV2 '
+        obj.use += [ 'SUIL' ]
 
-    if bld.env['FREESOUND']:
+    if bld.is_defined('FREESOUND'):
         obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
-
-    if bld.env['VST_SUPPORT']:
-        obj.source += [ 'vst_pluginui.cc' ]
-        obj.defines += [ 'VST_SUPPORT' ]
-        bld.env.append ('LINKFLAGS', '-lX11')
-
-    if bld.env['LXVST_SUPPORT']:
-        obj.source += [ 'lxvst_pluginui.cc' ]
+        obj.defines += [ 'FREESOUND' ]
+
+    if bld.is_defined('NEED_INTL'):
+        obj.linkflags = ' -lintl'
+
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
+        obj.source += [ 'windows_vst_plugin_ui.cc' ]
+        obj.defines += [ 'WINDOWS_VST_SUPPORT' ]
+        obj.use += [ 'X11' ]
+        
+    if bld.is_defined('LXVST_SUPPORT'):
+        obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ]
         obj.defines += [ 'LXVST_SUPPORT' ]
-        obj.linkflags += [ '-lX11' ]
+        obj.use += [ 'X11' ]
 
-    if bld.env['PHONE_HOME']:
+    if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'):
+        obj.source += [ 'vst_plugin_ui.cc' ]
+        
+    if bld.is_defined('PHONE_HOME'):
         obj.defines += [ 'PHONE_HOME' ]
 
-    if bld.env['COREAUDIO']:
+    if bld.is_defined('HAVE_COREAUDIO'):
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-        obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
-        obj.uselib_local += ' libappleutility '
+        obj.source += [ 'cocoacarbon.mm' ]
+        obj.use += ' libappleutility '
 
-    if bld.env['VST_SUPPORT']:
-        # If we require VST support we build a stub main() and the FST library
-        # here using winegcc, and link it to the GTK front-end library
-        obj = bld.new_task_gen (features = 'cxx cc cprogram wine')
-        obj.source = '''
-                ../libs/fst/fst.c
-                ../libs/fst/fstinfofile.c
-                ../libs/fst/vsti.c
-                ../libs/fst/vstwin.c
-                ../vst/winmain.c
-        '''
-        obj.includes = '../libs/fst'
-        obj.target = 'ardour-3.0-vst'
-        obj.linkflags += ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
-        obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
-        obj.uselib = 'ALSA'
-        obj.uselib_local = ['libpbd','libmidipp','libtaglib','libardour',
-                            'libardour_cp','libgtkmm2ext','libtaglib',
-                            'gtk2_ardour']
+    if bld.is_defined('AUDIOUNIT_SUPPORT'):
+        obj.source += [ 'au_pluginui.mm' ]
 
     # Wrappers
 
     wrapper_subst_dict = {
             'INSTALL_PREFIX' : bld.env['PREFIX'],
-            'LIBDIR'         : os.path.normpath(bld.env['LIBDIRNAME']),
-            'LIBS'           : 'build/default/libs',
+            'LIBDIR'         : os.path.normpath(bld.env['LIBDIR']),
+            'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
+            'SYSCONFDIR'     : os.path.normpath(bld.env['SYSCONFDIR']),
+            'LIBS'           : 'build/libs',
             'VERSION'        : '3.0',
-            'EXECUTABLE'     : 'build/default/gtk2_ardour/ardour-3.0'
+            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-3.0'
     }
 
-    obj              = bld.new_task_gen('subst')
+    def set_subst_dict(obj, dict):
+        for i in dict:
+            setattr(obj, i, dict[i])
+
+    obj              = bld(features = 'subst', rule= 'chmod 0755 ${TGT}')
     obj.source       = 'ardev_common.sh.in'
     obj.target       = 'ardev_common_waf.sh'
-    obj.chmod        = 0755
+    obj.chmod        = Utils.O755
     obj.dict         = wrapper_subst_dict
+    set_subst_dict(obj, wrapper_subst_dict)
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = 'ardour.sh.in'
     obj.target       = 'ardour3'
-    obj.chmod        = 0755
+    obj.chmod        = Utils.O755
     obj.dict         = wrapper_subst_dict
     obj.install_path = bld.env['BINDIR']
+    set_subst_dict(obj, wrapper_subst_dict)
+
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
+        obj              = bld(features = 'subst')
+        obj.source       = '../vst/ardourvst.in'
+        obj.target       = 'ardourvst3'
+        obj.chmod        = Utils.O755
+        obj.dict         = wrapper_subst_dict
+        obj.install_path = bld.env['BINDIR']
+        set_subst_dict(obj, wrapper_subst_dict)
 
     # Font configuration
 
@@ -410,33 +505,45 @@ def build(bld):
     base_font       = ""
 
     # Set up font sizes
-    if bld.env['IS_OSX']: # OS X fonts
-        basefont = "Lucida Grande"
+    if bld.is_defined('GTKOSX'): # OS X fonts
+        basefont = ""
         font_sizes = {
-                'TINY' : '7',
                 'SMALLER' : '9',
                 'SMALL' : '10',
                 'NORMAL' : '11',
-                'BIG' : '12',
-                'BIGGER' : '14',
+                'BIGGER' : '17',
                 'LARGE' : '18',
                 'LARGER' : '28',
                 'HUGER' : '36',
-                'MASSIVE' : '60'
+                'MASSIVE' : '60',
+        }
+        
+        # There is no acceptable monospace font available on older versions of OS X
+        # and no API on those versions to load TTF files that will work with 
+        # GTK/fontconfig/pango.
+        #
+        # In addition, the ArdourMono font gets clipped for some reason on OS X
+        #
+        # Moreover, Lucida Grande just seems to work even though it is not monospace
+        # so just use it.
+        #
+        font_names = {
+            'MONOSPACE' : 'Lucida Grande',
         }
     else: # Linux/X11 fonts
         basefont = '' # unspecified - use system defaults
         font_sizes = {
-                'TINY' : '6',
                 'SMALLER' : '8',
                 'SMALL' : '9',
                 'NORMAL' : '10',
-                'BIG' : '14',
-                'BIGGER' : '16',
+                'BIGGER' : '17',
                 'LARGE' : '18',
                 'LARGER' : '24',
                 'HUGER' : '34',
-                'MASSIVE' : '60'
+                'MASSIVE' : '60',
+        }
+        font_names = {
+                'MONOSPACE' : 'ArdourMono',
         }
 
     # Set up font substitution dictionary
@@ -459,6 +566,12 @@ def build(bld):
             dark_rc_subst_dict[key] = points
             light_rc_subst_dict[key] = points
 
+    # various font names, eg @BOLD_MONOSPACE@
+    for font_sym,text in iter(font_names.items()):
+        key = font_sym
+        dark_rc_subst_dict[key] = text
+        light_rc_subst_dict[key] = text
+
     # RC files
     dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
         'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
@@ -467,61 +580,77 @@ def build(bld):
         'gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
     light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = [ 'ardour3_ui_dark.rc.in' ]
-    obj.target       = 'ardour3_ui_dark.rc'
-    obj.dict         = dark_rc_subst_dict
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.target       = 'ardour3_ui_dark.rc.pre'
+    obj.install_path = None
+    set_subst_dict(obj, dark_rc_subst_dict)
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = [ 'ardour3_ui_light.rc.in' ]
-    obj.target       = 'ardour3_ui_light.rc'
-    obj.dict         = light_rc_subst_dict
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.target       = 'ardour3_ui_light.rc.pre'
+    obj.install_path = None
+    set_subst_dict(obj, light_rc_subst_dict)
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = [ 'ardour3_styles.rc.in' ]
     obj.target       = 'ardour3_dark_styles.rc'
-    obj.dict         = dark_rc_subst_dict
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.install_path = None
+    set_subst_dict(obj, dark_rc_subst_dict)
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = [ 'ardour3_styles.rc.in' ]
     obj.target       = 'ardour3_light_styles.rc'
-    obj.dict         = light_rc_subst_dict
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.install_path = None
+    set_subst_dict(obj, light_rc_subst_dict)
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = [ 'ardour3_fonts.rc.in' ]
     obj.target       = 'ardour3_dark_fonts.rc'
-    obj.dict         = dark_rc_subst_dict
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.install_path = None
+    set_subst_dict(obj, dark_rc_subst_dict)
 
-    obj              = bld.new_task_gen('subst')
+    obj              = bld(features = 'subst')
     obj.source       = [ 'ardour3_fonts.rc.in' ]
     obj.target       = 'ardour3_light_fonts.rc'
-    obj.dict         = light_rc_subst_dict
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.install_path = None
+    set_subst_dict(obj, light_rc_subst_dict)
 
-    obj              = bld.new_task_gen('copy')
+    obj              = bld(rule = 'cp ${SRC} ${TGT}')
     obj.source       = [ 'ardour3_widget_list.rc' ]
     obj.target       = 'ardour3_widgets.rc'
-    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+    obj.install_path = None
+
+    obj = bld (rule = include_processor)
+    obj.source = [ 'ardour3_ui_dark.rc.pre' ]
+    # find and add all ##include dependencies as sources
+    obj.source += _doPyp (bld.path.find_resource ('ardour3_ui_dark.rc.in').srcpath(), True)
+    obj.target = 'ardour3_ui_dark.rc'
+    obj.install_path = '${SYSCONFDIR}/ardour3'
+
+    obj = bld (rule = include_processor)
+    obj.source = [ 'ardour3_ui_light.rc.pre' ]
+    # find and add all ##include dependencies as sources
+    obj.source += _doPyp (bld.path.find_resource ('ardour3_ui_light.rc.in').srcpath(), True)
+    obj.target = 'ardour3_ui_light.rc'
+    obj.install_path = '${SYSCONFDIR}/ardour3'
 
     # Menus
     menus_argv = []
-    if bld.env['GTKOSX']:
+    if bld.is_defined('GTKOSX'):
         menus_argv = [ '-E', '-P', '-DGTKOSX' ]
     else:
         menus_argv = [ '-E', '-P' ]
-    obj = bld.new_task_gen('command-output')
+
+    obj = bld(features = 'command-output')
     obj.command = 'cpp'
     obj.command_is_external = True
     obj.no_inputs = True
     obj.argv = menus_argv
     obj.stdin = 'ardour.menus.in'
     obj.stdout = 'ardour.menus'
-    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'),
+    obj.dep_vars = ['GTKOSX']
+    bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
                       'ardour.menus')
 
     # Keybindings
@@ -530,38 +659,52 @@ def build(bld):
     # 'SAE-us-nokeypad', 'ergonomic-us'
 
     for b in [ 'mnemonic-us' ] :
-        obj = bld.new_task_gen (
+        obj = bld(
             target = b + '.bindings',
             source = b + '.bindings.in',
-            rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
+            rule = '../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap <${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] )
             )
-        obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+        obj.install_path = os.path.join(bld.env['SYSCONFDIR'], 'ardour3')
 
     # not modified at present
-    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'),
+    bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
                       'step_editing.bindings')
+    bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
+                      'mixer.bindings')
 
     # Icons/Images
-    bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png')
-    bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
+    bld.install_files('${DATADIR}/ardour3/icons', bld.path.ant_glob('icons/*.png'))
+    bld.install_files('${DATADIR}/ardour3/pixmaps', bld.path.ant_glob('pixmaps/*.xpm'))
     bld.install_files('${DATADIR}/ardour3', 'splash.png')
+    bld.install_files('${DATADIR}/ardour3', 'ArdourMono.ttf')
 
     # Default UI configuration
-    bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
-    # Generic widget style mappings
-    bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_widgets.rc')
-    
+    bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf')
+
     # Default export stuff
-    bld.install_files('${CONFIGDIR}/ardour3/export', 'export/*.format')
+    bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format'))
 
     # i18n
-    if bld.env['ENABLE_NLS']:
-        mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
+    if bld.is_defined('ENABLE_NLS'):
+        mo_files = bld.path.ant_glob('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)
+            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)
 
 def i18n(bld):
-    autowaf.build_i18n(bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+    autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+                       'Paul Davis')
+
+def i18n_pot(bld):
+    autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+                       'Paul Davis')
+
+def i18n_po(bld):
+    autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+                       'Paul Davis')
+
+def i18n_mo(bld):
+    autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+                       'Paul Davis')