From 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 17 Mar 2008 20:54:03 +0000 Subject: merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/SConscript | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/SConscript') diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 0d145e9a82..473ba61b08 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -36,6 +36,7 @@ gtkardour.Merge ([ libraries['fftw3'], libraries['fftw3f'], libraries['flac'], + libraries['freetype2'], libraries['gdkmm2'], libraries['glib2'], libraries['glibmm2'], @@ -410,12 +411,12 @@ if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']: keybindings_dict['%WINDOW%'] = 'Mod1' else: # - # Ctrl, Alt, Shift, Mod3(Meta) + # Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper) # keybindings_dict['%PRIMARY%'] = 'Ctrl' keybindings_dict['%SECONDARY%'] = 'Alt' keybindings_dict['%TERTIARY%'] = 'Shift' - keybindings_dict['%LEVEL4%'] = 'Mod2' + keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY'] keybindings_dict['%WINDOW%'] = 'Alt' for b in [ 'SAE-de', 'mnemonic-us', 'ergonomic-us' ]: @@ -472,9 +473,41 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files)) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', '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.Install(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes'), 'icons/application-x-ardour2.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 + '/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', @@ -488,7 +521,9 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardour-sae-ansi.bindings.in', 'ardour-sae-de.bindings.in', 'ardour3_ui_default.conf', - 'editor_xpms' + 'editor_xpms', + 'ardour2.xml', + 'ardour2.desktop.in' ] + gtkardour_files + vst_files + -- cgit v1.2.3