fix [rare] concurrent build issue:

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ab04d7b7d36ecfeae1c797bc1d7d77f9a3d09686..3072e54436d4af460db869ecd6df2612b5f878f7 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -55,6 +55,7 @@ gtk2_ardour_sources = [
         'configinfo.cc',
         'control_point.cc',
         'control_point_dialog.cc',
+        'cursor_context.cc',
         'curvetest.cc',
         'debug.cc',
         'edit_note_dialog.cc',
@@ -108,6 +109,7 @@ gtk2_ardour_sources = [
         'gtk_pianokeyboard.c',
         'gui_object.cc',
         'insert_time_dialog.cc',
+        'instrument_selector.cc',
         'interthread_progress_window.cc',
         'io_selector.cc',
         'hit.cc',
@@ -201,6 +203,7 @@ gtk2_ardour_sources = [
         'ruler_dialog.cc',
         'search_path_option.cc',
         'selection.cc',
+        'selection_memento.cc',
         'send_ui.cc',
         'session_dialog.cc',
         'session_import_dialog.cc',
@@ -249,7 +252,8 @@ gtk2_ardour_sources = [
         'video_server_dialog.cc',
         'utils_videotl.cc',
         'export_video_dialog.cc',
-        'export_video_infobox.cc'
+        'export_video_infobox.cc',
+        'video_tool_paths.cc'
 ]
 
 def options(opt):
@@ -430,7 +434,7 @@ def build(bld):
         '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') + '"',
+        'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
         ]
     obj.install_path = bld.env['DLLDIR']
     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
@@ -501,7 +505,7 @@ def build(bld):
         for i in dict:
             setattr(obj, i, dict[i])
 
-    obj              = bld(features = 'subst', rule= 'chmod 0755 ${TGT}')
+    obj              = bld(features = 'subst')
     obj.source       = 'ardev_common.sh.in'
     obj.target       = 'ardev_common_waf.sh'
     obj.chmod        = Utils.O755
@@ -561,15 +565,15 @@ def build(bld):
     else: # Linux/X11 fonts
         basefont = '' # unspecified - use system defaults
         font_sizes = {
-                'SMALLER' : '8',
-                'SMALL' : '9',
-                'NORMAL' : '10',
-                'BIG' : '14',
-                'BIGGER' : '17',
-                'LARGE' : '18',
-                'LARGER' : '24',
-                'HUGER' : '34',
-                'MASSIVE' : '60',
+                'SMALLER' : '6',
+                'SMALL' : '7',
+                'NORMAL' : '8',
+                'BIG' : '11',
+                'BIGGER' : '13.5',
+                'LARGE' : '14.5',
+                'LARGER' : '19',
+                'HUGER' : '27',
+                'MASSIVE' : '48',
         }
         font_names = {
                 'MONOSPACE' : 'ArdourMono',
@@ -650,6 +654,7 @@ def build(bld):
         obj.install_path = bld.env['CONFDIR']
 
     # not modified at present
+    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
     bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings')
     bld.install_files(bld.env['CONFDIR'], 'mixer.bindings')
 
@@ -662,6 +667,8 @@ def build(bld):
 
     # Default UI configuration
     bld.install_files(bld.env['CONFDIR'], 'default_ui_config')
+    # Color Themes
+    bld.install_files(bld.env['CONFDIR'], 'dark.colors')
 
     # Default export stuff
     bld.install_files(os.path.join(bld.env['CONFDIR'],' export'), bld.path.ant_glob('export/*.format'))
@@ -671,9 +678,8 @@ def build(bld):
         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)
+            bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+                            mo)
 
 def i18n(bld):
     autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,