minor fixes to wscript files to make things python3 compatible

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 35ac210f214830b2bb98cd60ed83ec2926bbac34..95d359f9824e9168047bb511619720188e4a6537 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -101,8 +101,6 @@ gtk2_ardour_sources = [
         'ghostregion.cc',
         'global_port_matrix.cc',
         'group_tabs.cc',
-        'gtk-custom-hruler.c',
-        'gtk-custom-ruler.c',
         'gtk_pianokeyboard.c',
         'gui_object.cc',
         'insert_time_dialog.cc',
@@ -195,6 +193,7 @@ gtk2_ardour_sources = [
         'route_processor_selection.cc',
         'route_time_axis.cc',
         'route_ui.cc',
+        'ruler_dialog.cc',
         'search_path_option.cc',
         'selection.cc',
         'send_ui.cc',
@@ -204,6 +203,7 @@ gtk2_ardour_sources = [
         'session_option_editor.cc',
         'sfdb_ui.cc',
         'shuttle_control.cc',
+        'soundcloud_export_selector.cc',
         'splash.cc',
         'speaker_dialog.cc',
         'startup.cc',
@@ -261,10 +261,6 @@ def configure(conf):
         '', '')
     autowaf.configure(conf)
 
-    if Options.options.dist_target == 'auto':
-        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 CoreAudio is present
 
     autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F',
@@ -379,7 +375,7 @@ def build(bld):
                              'libgtkmm2ext',
                              'libcanvas'
                              ]
-        obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
+        obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@@ -396,7 +392,7 @@ def build(bld):
         # just the normal executable version of the GTK GUI
         obj = bld (features = 'cxx c cxxprogram')
         obj.source    = gtk2_ardour_sources
-        obj.target = 'ardour-' + bld.env['VERSION']
+        obj.target = 'ardour-' + str (bld.env['VERSION'])
         obj.includes = ['.']
         obj.ldflags = ['-no-undefined']
 
@@ -419,12 +415,12 @@ def build(bld):
 
     obj.defines = [
         'PACKAGE="' + I18N_PACKAGE + '"',
-        'VERSIONSTRING="' + bld.env['VERSION'] + '"',
+        'VERSIONSTRING="' + str (bld.env['VERSION']) + '"',
         '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') + '"',
         ]
-    obj.install_path = os.path.join(bld.env['DLLDIR'])
+    obj.install_path = bld.env['DLLDIR']
     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
     obj.uselib       += ' GTKMM CANVAS FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
@@ -434,7 +430,7 @@ def build(bld):
         obj.uselib += ' AUDIOUNITS OSX GTKOSX'
         obj.use    += ' libappleutility'
         obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ]
-    elif sys.platform == 'mingw':
+    elif bld.env['build_target'] == 'mingw':
         obj.source += [ 'bundle_env_mingw.cc' ]
     else:
         obj.source += [ 'bundle_env_linux.cc' ]
@@ -478,18 +474,14 @@ def build(bld):
 
     # Wrappers
 
-        print 'DLL = ' + bld.env['DLLDIR'], '\n'
-        print 'DATADIR = ' + bld.env['DATADIR'], '\n'
-        print 'CONF = ' + bld.env['CONFDIR'], '\n'
-
     wrapper_subst_dict = {
             'INSTALL_PREFIX' : bld.env['PREFIX'],
             'LIBDIR'         : os.path.normpath(bld.env['DLLDIR']),
             'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
-            'SYSCONFDIR'     : os.path.normpath(bld.env['CONFDIR']),
+            'CONFDIR'        : os.path.normpath(bld.env['CONFDIR']),
             'LIBS'           : 'build/libs',
             'VERSION'        : bld.env['VERSION'],
-            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
+            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-' + str (bld.env['VERSION'])
     }
 
     def set_subst_dict(obj, dict):
@@ -524,6 +516,7 @@ def build(bld):
 
     dark_rc_subst_dict = {}
     light_rc_subst_dict = {}
+    ui_conf_dict = {}
     font_sizes      = {}
     base_font       = ""
 
@@ -584,18 +577,21 @@ def build(bld):
 
             dark_rc_subst_dict[key] = fontstyle
             light_rc_subst_dict[key] = fontstyle
-
+            ui_conf_dict[key] = points
+            
     # @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
+            ui_conf_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
+        ui_conf_dict[key] = text
 
     # RC files
     dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
@@ -660,6 +656,12 @@ def build(bld):
     obj.target = 'ardour3_ui_light.rc'
     obj.install_path = bld.env['CONFDIR']
 
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_ui_default.conf.in' ]
+    obj.target       = 'ardour3_ui_default.conf'
+    obj.install_path = None
+    set_subst_dict(obj, ui_conf_dict)
+
     # Menus
     menus_argv = []
     if bld.is_defined('GTKOSX'):
@@ -695,7 +697,7 @@ def build(bld):
             source = b + '.bindings.in',
             rule = a_rule
             )
-        obj.install_path = os.path.join(bld.env['CONFDIR'])
+        obj.install_path = bld.env['CONFDIR']
 
     # not modified at present
     bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings')