more changes to wscript files to catch up with waf 1.6 and fix OS X issues
[ardour.git] / gtk2_ardour / wscript
index bde630e325444007083eec9e91d27ac3a62b0d80..410555f9afccbe142e15c94a7bb2ae6047ff8ace 100644 (file)
@@ -1,10 +1,9 @@
 #!/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
 
 # Version of this package (even if built as a child)
@@ -18,8 +17,8 @@ APPNAME = 'gtk2_ardour'
 VERSION = GTK2_ARDOUR_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 path_prefix = 'gtk2_ardour/'
 
@@ -120,6 +119,7 @@ gtk2_ardour_sources = [
         'gtk-custom-hruler.c',
         'gtk-custom-ruler.c',
         'gtk_pianokeyboard.c',
+        'gui_object.cc',
         'insert_time_dialog.cc',
         'interthread_progress_window.cc',
         'io_selector.cc',
@@ -133,6 +133,7 @@ gtk2_ardour_sources = [
         'main.cc',
         'marker.cc',
         'midi_automation_line.cc',
+        'midi_channel_dialog.cc',
         'midi_channel_selector.cc',
         'midi_cut_buffer.cc',
         'midi_list_editor.cc',
@@ -217,56 +218,103 @@ gtk2_ardour_sources = [
         'time_axis_view.cc',
         'time_axis_view_item.cc',
         'time_fx_dialog.cc',
+        'time_info_box.cc',
         'time_selection.cc',
         'track_selection.cc',
         'track_view_list.cc',
         'transpose_dialog.cc',
         'ui_config.cc',
         'utils.cc',
+        'verbose_cursor.cc',
         'version.cc',
         'volume_controller.cc',
         'waveview.cc',
         'window_proxy.cc'
 ]
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-    autowaf.build_version_files(path_prefix+'version.h', path_prefix+'version.cc',
-                    'gtk2_ardour', MAJOR, MINOR, MICRO)
+    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')
-        #
-        #       TODO: Insert a sanity check for on OS X
-        #       to ensure that CoreAudio is present....
-        #       Really shouldn't these checks be in AutoWaf?
-        #
-    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1')
-    autowaf.check_pkg(conf, 'gthread', 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')
 
-    conf.check_tool('misc') # subst tool
+    # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
+
+    autowaf.check_pkg(conf, 'flac', uselib_store='FLAC',
+                      atleast_version='1.2.1')
+    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')
 
-    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'
 
+#pre-processor-like operation to merge GTK RC files
+re_spaces = re.compile("\s+")
+
+def _doPyp(infileName):
+    """
+    Does the main work of preprocessing.
+    Takes 'infileName' as a filename, opens and processes it,
+    and returns the processed file as a string
+
+    Note - this works recursively.
+    """
+    outStr = ''
+    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]
+            # assume included file comes from same place as source file
+            incName = os.path.join (os.path.dirname (infileName), incName);
+            outStr += _doPyp(incName)
+        else:
+            outStr += line
+
+    # done
+    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 = ''
@@ -286,17 +334,18 @@ def build_color_scheme(path, prefix):
 
 
 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')
+    # GTK front-end; if we're using VST we build this as a shared library,
+    # otherwise it's a normal executabale
+    if bld.is_defined('VST_SUPPORT'):
+        obj = bld(features = 'cxx c cxxshlib')
     else:
-        obj = bld.new_task_gen(features = 'cxx cc cprogram')
+        obj = bld(features = 'cxx c cxxprogram')
 
     obj.includes     = ['.']
     obj.source       = gtk2_ardour_sources
     obj.name         = 'gtk2_ardour'
-    if bld.env['VST_SUPPORT']:
+    obj.linkflags    = []
+    if bld.is_defined('VST_SUPPORT'):
         obj.target = 'gtk2_ardour'
         obj.includes += ['../libs/fst']
     else:
@@ -305,46 +354,54 @@ def build(bld):
     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
+    obj.use          = '''libpbd libmidipp libtaglib libardour libardour_cp
                           libgtkmm2ext libtaglib libgnomecanvas-2'''
     if sys.platform == 'darwin':
-        obj.uselib_local + ' libappleutility'
-    obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
-    obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
-    obj.cxxflags     += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
-    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     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
-    obj.cxxflags     += ['-I../libs']
-
-    if bld.env['HAVE_SLV2']:
+        obj.use += ' libappleutility'
+    obj.defines     = [
+        'PACKAGE="gtk2_ardour"',
+        'VERSIONSTRING="' + bld.env['VERSION'] + '"',
+        'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+        'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+        'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"',
+        'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']),
+                                     'locale') + '"',
+        'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
+        ]
+    obj.includes += ['../libs']
+
+    if bld.is_defined('HAVE_SUIL'):
+        obj.source += [ 'lv2_plugin_ui.cc' ]
+        obj.uselib += ' SUIL '
+    elif bld.is_defined('HAVE_SLV2'):
         obj.source += [ 'lv2_plugin_ui.cc' ]
         obj.uselib += ' SLV2 '
 
-    if bld.env['FREESOUND']:
+    if bld.is_defined('FREESOUND'):
         obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
 
-    if bld.env['VST_SUPPORT']:
+    if bld.is_defined('VST_SUPPORT'):
         obj.source += [ 'vst_pluginui.cc' ]
-        obj.cxxflags += [ '-DVST_SUPPORT' ]
+        obj.defines += [ 'VST_SUPPORT' ]
+        bld.env.append ('LINKFLAGS', '-lX11')
+
+    if bld.is_defined('LXVST_SUPPORT'):
+        obj.source += [ 'lxvst_pluginui.cc' ]
+        obj.defines += [ 'LXVST_SUPPORT' ]
+        obj.linkflags += [ '-lX11' ]
 
-    if bld.env['PHONE_HOME']:
-        obj.cxxflags += [ '-DPHONE_HOME' ]
+    if bld.is_defined('PHONE_HOME'):
+        obj.defines += [ 'PHONE_HOME' ]
 
-    if bld.env['COREAUDIO']:
+    if bld.is_defined('COREAUDIO'):
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
         obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
-        obj.uselib_local += ' libappleutility '
-    else:
-        obj.source += [ 'x11.cc' ]
+        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')
+    if bld.is_defined('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
@@ -354,33 +411,41 @@ def build(bld):
         '''
         obj.includes = '../libs/fst'
         obj.target = 'ardour-3.0-vst'
-        obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
+        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'''
+        obj.use = ['libpbd','libmidipp','libtaglib','libardour',
+                            'libardour_cp','libgtkmm2ext','libtaglib',
+                            'gtk2_ardour']
 
     # 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']),
+            '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)
 
     # Font configuration
 
@@ -390,7 +455,7 @@ def build(bld):
     base_font       = ""
 
     # Set up font sizes
-    if bld.env['IS_OSX']: # OS X fonts
+    if bld.is_defined('GTKOSX'): # OS X fonts
         basefont = "Lucida Grande"
         font_sizes = {
                 'TINY' : '7',
@@ -419,7 +484,8 @@ def build(bld):
                 'MASSIVE' : '60'
         }
 
- # Set up font substitution dictionary
+    # Set up font substitution dictionary
+    # @FONT_XXXX@
     for style in ['', 'BOLD', 'ITALIC']:
         for sizename,points in iter(font_sizes.items()):
             if (len (style)):
@@ -432,71 +498,127 @@ def build(bld):
             dark_rc_subst_dict[key] = fontstyle
             light_rc_subst_dict[key] = fontstyle
 
+    # @FONT_SIZE_XXXX@
+    for sizename,points in iter(font_sizes.items()):
+            key = "_".join (['FONT_SIZE',sizename])
+            dark_rc_subst_dict[key] = points
+            light_rc_subst_dict[key] = points
+
     # RC files
-    dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
+    dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
+        'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK')
     dark_rc_subst_dict['COLPREFIX'] = 'ARDOUR_DARK'
-    light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme ('gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
+    light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
+        'gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT')
     light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
 
-    obj              = bld.new_task_gen('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              = bld.new_task_gen('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              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_ui_dark.rc.in' ]
+    obj.target       = 'ardour3_ui_dark.rc.pre'
+    obj.install_path = None
+    set_subst_dict(obj, dark_rc_subst_dict)
+
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_ui_light.rc.in' ]
+    obj.target       = 'ardour3_ui_light.rc.pre'
+    obj.install_path = None
+    set_subst_dict(obj, light_rc_subst_dict)
+
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_styles.rc.in' ]
+    obj.target       = 'ardour3_dark_styles.rc'
+    obj.install_path = None
+    set_subst_dict(obj, dark_rc_subst_dict)
+
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_styles.rc.in' ]
+    obj.target       = 'ardour3_light_styles.rc'
+    obj.install_path = None
+    set_subst_dict(obj, light_rc_subst_dict)
+
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_fonts.rc.in' ]
+    obj.target       = 'ardour3_dark_fonts.rc'
+    obj.install_path = None
+    set_subst_dict(obj, dark_rc_subst_dict)
+
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_fonts.rc.in' ]
+    obj.target       = 'ardour3_light_fonts.rc'
+    obj.install_path = None
+    set_subst_dict(obj, light_rc_subst_dict)
+
+    obj              = bld(rule = 'cp ${SRC} ${TGT}')
+    obj.source       = [ 'ardour3_widget_list.rc' ]
+    obj.target       = 'ardour3_widgets.rc'
+    obj.install_path = None
+
+    bld (
+        rule   = include_processor,
+        source = 'ardour3_ui_dark.rc.pre',
+        target = 'ardour3_ui_dark.rc'
+        )
+
+    bld (
+        rule   = include_processor,
+        source = 'ardour3_ui_light.rc.pre',
+        target = 'ardour3_ui_light.rc'
+        )
 
     # 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'), 'ardour.menus')
+    bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
+                      'ardour.menus')
 
     # Keybindings
 
-    # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'ergonomic-us'
+    # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad',
+    # 'SAE-us-nokeypad', 'ergonomic-us'
 
     for b in [ 'mnemonic-us' ] :
-        obj = bld.new_task_gen (
-                target = b + '.bindings',
-                source = b + '.bindings.in',
-                rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
-                )
-        obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+        obj = bld(
+            target = b + '.bindings',
+            source = b + '.bindings.in',
+            rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
+            )
+        obj.install_path = os.path.join(bld.env['SYSCONFDIR'], 'ardour3')
 
     # not modified at present
-    bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'step_editing.bindings')
+    bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
+                      'step_editing.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')
 
     # Default UI configuration
-    bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
+    bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf')
+    # Generic widget style mappings
+    bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_widgets.rc')
 
     # 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)
+            bld.install_as (os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                         lang, 'LC_MESSAGES', APPNAME + '.mo'),
+                            mo)
 
 def i18n(bld):
-    autowaf.build_i18n (bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+    autowaf.build_i18n(bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)