X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2FSConscript;h=8aaffc042ec74370ce5a382583eaf8c20791e904;hb=cc15fb071f3c327f17bbe1b0613974d5060b7f90;hp=b58b94433c827a016bb360f46c616cc5ed902784;hpb=0b1c369e15af54cf809140b75af99d72edce24ae;p=ardour.git diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index b58b94433c..8aaffc042e 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -6,14 +6,14 @@ import glob Import('env install_prefix final_prefix config_prefix libraries i18n ardour_version') -gtkardour = env.Copy() -gtkmmtests = env.Copy() +gtkardour = env.Clone() +gtkmmtests = env.Clone() # # this defines the version number of the GTK interface to ardour # -domain = 'gtk_ardour' +domain = 'gtk2_ardour' gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2) gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") @@ -24,44 +24,50 @@ gtkardour.Append(CPPPATH="#/") # for top level svn_revision.h gtkardour.Append(PACKAGE=domain) gtkardour.Append(POTFILE=domain + '.pot') +if gtkardour['IS_OSX']: + gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048") + gtkardour.Merge ([ libraries['ardour'], libraries['ardour_cp'], - libraries['gtkmm2ext'], - libraries['midi++2'], - libraries['pbd'], - libraries['gtkmm2'], + libraries['atkmm'], + libraries['fftw3'], + libraries['fftw3f'], + libraries['freetype2'], + libraries['gdkmm2'], libraries['glib2'], + libraries['glibmm2'], + libraries['gtk2'], + libraries['gtkmm2'], + libraries['gtkmm2ext'], + libraries['jack'], libraries['libgnomecanvas2'], libraries['libgnomecanvasmm'], - libraries['sysmidi'], - libraries['sndfile-ardour'], - libraries['flac'], libraries['lrdf'], - libraries['glibmm2'], + libraries['midi++2'], libraries['pangomm'], - libraries['atkmm'], - libraries['gdkmm2'], + libraries['pbd'], + libraries['samplerate'], libraries['sigc2'], - libraries['gtk2'], + libraries['sndfile'], + libraries['sysmidi'], + libraries['vamphost'], + libraries['vamp'], libraries['xml'], - libraries['xslt'], - libraries['soundtouch'], - libraries['samplerate'], - libraries['jack'] + libraries['xslt'] ]) gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") gtkmmtests.Merge ([ - libraries['gtkmm2'], + libraries['atkmm'], + libraries['gdkmm2'], libraries['glib2'], libraries['glibmm2'], + libraries['gtk2'], + libraries['gtkmm2'], libraries['pangomm'], - libraries['atkmm'], - libraries['gdkmm2'], - libraries['sigc2'], - libraries['gtk2'] + libraries['sigc2'] ]) if gtkardour['DMALLOC']: @@ -72,12 +78,29 @@ if gtkardour['FFT_ANALYSIS']: gtkardour.Merge ([libraries['fftw3f']]) gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS') +if gtkardour['FREESOUND']: + gtkardour.Merge ([libraries['curl']]) + gtkardour.Append(CCFLAGS='-DFREESOUND') + +if gtkardour['RUBBERBAND']: + gtkardour.Merge ([ libraries['rubberband'] ]) +else: + gtkardour.Merge ([ libraries['soundtouch'] ]) + skipped_files=Split(""" connection_editor.cc """) audiounit_files=Split(""" -au_pluginui.cc +au_pluginui.mm +""") + +gtkosx_files=Split(""" +cocoacarbon.mm +""") + +x11_files=Split(""" +x11.cc """) gtkardour_files=Split(""" @@ -93,7 +116,9 @@ ardour_ui_ed.cc ardour_ui_mixer.cc ardour_ui_options.cc audio_clock.cc -route_time_axis.cc +audio_region_editor.cc +audio_region_view.cc +audio_streamview.cc audio_time_axis.cc automation_gain_line.cc automation_line.cc @@ -103,14 +128,11 @@ axis_view.cc boolean_automation_line.cc canvas-imageframe.c canvas-simpleline.c -simpleline.cc canvas-simplerect.c -simplerect.cc canvas-waveview.c crossfade_edit.cc crossfade_view.cc curvetest.cc -enums.cc editing.cc editor.cc editor_actions.cc @@ -139,12 +161,14 @@ editor_selection_list.cc editor_tempodisplay.cc editor_timefx.cc engine_dialog.cc +enums.cc export_dialog.cc -export_session_dialog.cc -export_region_dialog.cc export_range_markers_dialog.cc +export_region_dialog.cc +export_session_dialog.cc gain_automation_time_axis.cc gain_meter.cc +generic_pluginui.cc ghostregion.cc gtk-custom-hruler.c gtk-custom-ruler.c @@ -156,7 +180,8 @@ imageframe_time_axis_view.cc imageframe_view.cc io_selector.cc keyboard.cc -ladspa_pluginui.cc +keyeditor.cc +level_meter.cc location_ui.cc main.cc marker.cc @@ -166,6 +191,7 @@ marker_view.cc midi_port_dialog.cc mixer_strip.cc mixer_ui.cc +nag.cc new_session_dialog.cc option_editor.cc opts.cc @@ -181,21 +207,24 @@ public_editor.cc redirect_automation_line.cc redirect_automation_time_axis.cc redirect_box.cc -audio_region_editor.cc region_gain_line.cc region_selection.cc region_view.cc -audio_region_view.cc +rhythm_ferret.cc route_params_ui.cc route_redirect_selection.cc +route_time_axis.cc route_ui.cc selection.cc -sfdb_ui.cc send_ui.cc +sfdb_ui.cc +simpleline.cc +simplerect.cc +splash.cc streamview.cc -audio_streamview.cc tape_region_view.cc tempo_dialog.cc +tempo_lines.cc theme_manager.cc time_axis_view.cc time_axis_view_item.cc @@ -213,11 +242,19 @@ fft_graph.cc fft_result.cc """) +freesound_files=Split(""" +sfdb_freesound_mootcher.cc +""") + pixmap_files = glob.glob('pixmaps/*.xpm') icon_files = glob.glob ('icons/*.png') intl_files = gtkardour_files + glob.glob('*.h') +evtest_files=Split(""" +evtest.cc +""") + mtest_files=Split(""" mtest.cc """) @@ -247,15 +284,34 @@ if env['VST']: extra_sources += vst_files gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst") -if gtkardour['AUDIOUNITS']: - extra_sources += audiounit_files - gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS') - gtkardour.Append(LINKFLAGS='-framework Carbon') - gtkardour.Merge([libraries['appleutility']]) +lv2_files = [ 'lv2_plugin_ui.cc' ] + +if env['LV2']: + extra_sources += lv2_files + gtkardour.Append (CCFLAGS="-DHAVE_LV2") + gtkardour.Merge ([libraries['slv2']]) + + +if gtkardour['GTKOSX']: + extra_sources += gtkosx_files + gtkardour.Append (CCFLAGS="-DTOP_MENUBAR -DGTKOSX") + gtkardour.Append (LINKFLAGS=" -framework AppKit -framework CoreAudioKit") + + if gtkardour['AUDIOUNITS']: + extra_sources += audiounit_files + gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS') + gtkardour.Merge([libraries['appleutility']]) + +else: + extra_sources += x11_files + if env['FFT_ANALYSIS']: extra_sources += fft_analysis_files +if env['FREESOUND']: + extra_sources += freesound_files + intl_files += extra_sources gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") @@ -270,6 +326,7 @@ executable = 'ardour-' + ardour_version ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources) ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources) +evest = gtkmmtests.Program(target = 'evtest', source = evtest_files) mtest = gtkardour.Program(target = 'mtest', source = mtest_files) itest = gtkardour.Program(target = 'itest', source = itest_files) rcu = gtkardour.Program(target = 'rcu', source = rcu_files) @@ -277,81 +334,84 @@ tt = gtkmmtests.Program(target = 'tt', source = tt_files) my_font_dict = { } -if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger': +if gtkardour['IS_OSX']: # # OS X font rendering is different even with X11 # - my_font_dict['%FONT_TINY%'] = 'sans 7' - my_font_dict['%FONT_SMALLERER%'] = 'sans 8' - my_font_dict['%FONT_SMALLER%'] = 'sans 9' - my_font_dict['%FONT_SMALL%'] = 'sans 10' - my_font_dict['%FONT_NORMAL%'] = 'sans 11' - my_font_dict['%FONT_BIG%'] = 'sans 12' - my_font_dict['%FONT_BIGGER%'] = 'sans 14' - my_font_dict['%FONT_LARGE%'] = 'sans 18' - my_font_dict['%FONT_LARGER%'] = 'sans 28' - my_font_dict['%FONT_HUGER%'] = 'sans 36' - my_font_dict['%FONT_MASSIVE%'] = 'sans 60' - my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 7' - my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 9' - my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 10' - my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 11' - my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 13' - my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14' - my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 20' - my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 25' - my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 36' - my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60' - my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 7' - my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 9' - my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 10' - my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 11' - my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 15' - my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 16' - my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 20' - my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 28' - my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 36' - my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60' + + font_sizes = { + 'TINY' : '7', + 'SMALLER' : '9', + 'SMALL' : '10', + 'NORMAL' : '11', + 'BIG' : '12', + 'BIGGER' : '14', + 'LARGE' : '18', + 'LARGER' : '28', + 'HUGER' : '36', + 'MASSIVE' : '60' + } + basefont = "Lucida Grande" + else: # # Linux/X11 font rendering # - my_font_dict['%FONT_TINY%'] = 'sans 4' - my_font_dict['%FONT_SMALLERER%'] = 'sans 6' - my_font_dict['%FONT_SMALLER%'] = 'sans 6' - my_font_dict['%FONT_SMALL%'] = 'sans 7' - my_font_dict['%FONT_NORMAL%'] = 'sans 8' - my_font_dict['%FONT_BIG%'] = 'sans 12' - my_font_dict['%FONT_BIGGER%'] = 'sans 14' - my_font_dict['%FONT_LARGE%'] = 'sans 18' - my_font_dict['%FONT_LARGER%'] = 'sans 24' - my_font_dict['%FONT_HUGER%'] = 'sans 34' - my_font_dict['%FONT_MASSIVE%'] = 'sans 60' - my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 4' - my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 6' - my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 7' - my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 8' - my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 12' - my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14' - my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 18' - my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 24' - my_font_dict['%FONT_BOLD_HUGE%'] = 'sans bold 25' - my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 34' - my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60' - my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 4' - my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 6' - my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 7' - my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 8' - my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 12' - my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 14' - my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 18' - my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 24' - my_font_dict['%FONT_ITALIC_HUGE%'] = 'sans italic 25' - my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34' - my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60' + + if gtkardour['OLDFONTS']: + font_sizes = { + 'TINY' : '4', + 'SMALLER' : '6', + 'SMALL' : '7', + 'NORMAL' : '8', + 'BIG' : '12', + 'BIGGER' : '14', + 'LARGE' : '18', + 'LARGER' : '24', + 'HUGER' : '34', + 'MASSIVE' : '60' + } + else: + font_sizes = { + 'TINY' : '6', + 'SMALLER' : '8', + 'SMALL' : '9', + 'NORMAL' : '10', + 'BIG' : '14', + 'BIGGER' : '16', + 'LARGE' : '18', + 'LARGER' : '24', + 'HUGER' : '34', + 'MASSIVE' : '60' + } + + basefont = "sans" + +for style in ['', 'BOLD', 'ITALIC']: + for sizename,points in font_sizes.iteritems(): + if (len (style)): + key = "_".join (['FONT',style,sizename]) + fontstyle = " ".join ([basefont,style.lower(),points]) + else: + key = "_".join (['FONT',sizename]) + fontstyle = " ".join ([basefont,points]) + + key = '%' + key + '%' + my_font_dict[key] = fontstyle + +# +# create menus based on build platform +# + +if env['GTKOSX']: + ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1) +else: + ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1) ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict) ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict) +ardour_dark_sae_theme = env.SubstInFile ('ardour2_ui_dark_sae.rc', 'ardour2_ui_dark_sae.rc.in', SUBST_DICT = my_font_dict) +ardour_light_sae_theme = env.SubstInFile ('ardour2_ui_light_sae.rc', 'ardour2_ui_light_sae.rc.in', SUBST_DICT = my_font_dict) my_subst_dict = { } @@ -359,7 +419,35 @@ my_subst_dict = { } # null substitution just to avoid ardour.bindings being in svn # -ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = my_subst_dict); +keybindings_dict = { } + +if gtkardour['GTKOSX']: + # + # Command(Meta), Alt(Mod1), Ctrl, Shift + # **** as of february 4th 2008, OUR VERSION OF ***** + # Gtk/Quartz maps: + # NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Meta + # NSAlternate (aka "Option") -> Mod1 + # + keybindings_dict['%PRIMARY%'] = 'Meta' + keybindings_dict['%SECONDARY%'] = 'Mod1' + keybindings_dict['%TERTIARY%'] = 'Shift' + keybindings_dict['%LEVEL4%'] = 'Ctrl' + keybindings_dict['%WINDOW%'] = 'Mod1' +else: + # + # Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper) + # + keybindings_dict['%PRIMARY%'] = 'Ctrl' + keybindings_dict['%SECONDARY%'] = 'Alt' + keybindings_dict['%TERTIARY%'] = 'Shift' + keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY'] + keybindings_dict['%WINDOW%'] = 'Alt' + +for b in [ 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]: + target_file = b + '.bindings' + src_file = target_file + '.in' + Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict)) my_subst_dict['%INSTALL_PREFIX%'] = final_prefix my_subst_dict['%LIBDIR%'] = env['LIBDIR'] @@ -371,11 +459,13 @@ env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755)) ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT = my_subst_dict); env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755)) -Default(ardourbindings) Default(ardourdev) Default(ardoursh) Default(ardour_dark_theme) Default(ardour_light_theme) +Default(ardour_dark_sae_theme) +Default(ardour_light_sae_theme) +Default(ardour_menus) if env['VST']: Default(ardourlib) @@ -401,16 +491,62 @@ if env['NLS']: # configuration files env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_sae_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_sae_theme)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.menus')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de-keypad.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-us-keypad.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de-nokeypad.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-us-nokeypad.bindings')) # data files env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files)) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'icons'), icon_files)) - env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], [])) - + +# This will install icons and MIME type as per freedesktop.org specs. # +if env['FREEDESKTOP']: + desktop_icon_install_prefix = install_prefix + '/share/icons/hicolor' + # Install the desktop icons to the default locations # + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour2.png'), 'icons/ardour_icon_16px.png')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour2.png'), 'icons/ardour_icon_22px.png')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour2.png'), 'icons/ardour_icon_32px.png')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour2.png'), 'icons/ardour_icon_48px.png')) + # Install the mime type xml file and its icon # + env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour2.xml')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_16px.png')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png')) + env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png')) + env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET')) + # Update the icon cache # + env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET')) + env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET')) + # Make the ardour2.desktop file and install it # + env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES > $TARGET')) + env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop')) + env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET')) + # uninstall target.. needed to run update-mime-database and update-desktop-database after removal. #` + remove_desktop_files = env.Command ('another_frobnicatory_decoy', [], + [ Delete (install_prefix + '/share/mime/packages/ardour2.xml'), + Delete (install_prefix + '/share/applications/ardour2.desktop'), + Delete (desktop_icon_install_prefix + '/16x16/apps/ardour2.png'), + Delete (desktop_icon_install_prefix + '/22x22/apps/ardour2.png'), + Delete (desktop_icon_install_prefix + '/32x32/apps/ardour2.png'), + Delete (desktop_icon_install_prefix + '/48x48/apps/ardour2.png'), + Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour2.png'), + Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour2.png'), + Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour2.png'), + Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour2.png'), + Action ('update-mime-database ' + install_prefix + '/share/mime'), + Action ('gtk-update-icon-cache ' + desktop_icon_install_prefix), + Action ('update-desktop-database ' + install_prefix + '/share/applications')]) + env.Alias('uninstall', remove_desktop_files) + #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', @@ -418,9 +554,23 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardour.sh.in', 'ardev_common.sh.in', 'ardev', 'ardbg', - 'ardour2_ui_dark.rc.in', 'ardour2_ui_light.rc.in', 'splash.png', - 'ardour.menus', 'ardour.bindings.in', 'ardour2_ui_default.conf', - 'editor_xpms' + 'ardour2_ui_dark.rc.in', + 'ardour2_ui_light.rc.in', + 'ardour2_ui_dark_sae.rc.in', + 'ardour2_ui_light_sae.rc.in', + 'splash.png', + 'ardour.menus.in', + 'ardour-sae.menus', + 'mnemonic-us.bindings.in', + 'ergonomic-us.bindings.in', + 'SAE-us-keypad.bindings.in', + 'SAE-us-nokeypad.bindings.in', + 'SAE-de-keypad.bindings.in', + 'SAE-de-nokeypad.bindings.in', + 'ardour2_ui_default.conf', + 'editor_xpms', + 'ardour2.xml', + 'ardour2.desktop.in' ] + gtkardour_files + vst_files + @@ -428,7 +578,11 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], icon_files + skipped_files + audiounit_files + + lv2_files + + gtkosx_files + + x11_files + fft_analysis_files + + freesound_files + glob.glob('po/*.po') + glob.glob('*.h'))) # generate a prototype full-featured ardour_ui.rc file