From 6a9cf1e210e9cb6cb37e0137aec14e6a380e5147 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 7 Sep 2014 10:23:03 -0400 Subject: [PATCH] fix packaging scripts to use new system config file name; NOTE: this file should probably be included in Windows packages but appears not to be Conflicts: tools/linux_packaging/build --- tools/linux_packaging/build | 19 ++++++++++--------- tools/osx_packaging/osx_build | 4 +--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index bfdc247bf2..7d80644ac7 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -528,15 +528,16 @@ echo "Copying other stuff to $APPDIR ..." #cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings $Etc cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings $Etc cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc -cp ../../ardour_system.rc $Etc/ardour_system.rc -cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_light.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_light.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_light_fonts.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_light_styles.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_dark_styles.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_widgets.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_default.conf $Etc -cp $BUILD_ROOT/gtk2_ardour/ardour3_ui_default.conf $Etc/ardour3_ui.conf +cp ../../system_config $Etc/system_config +cp $BUILD_ROOT/gtk2_ardour/ui_light.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/ui_light.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/light_fonts.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/dark_fonts.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/light_styles.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/dark_styles.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/widgets.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/ui_default.conf $Etc +cp $BUILD_ROOT/gtk2_ardour/ui_default.conf $Etc/ardour3_ui.conf # these are copied straight from the source tree diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index cd729ec60e..28ef7a8190 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -428,12 +428,10 @@ if test x$SAE != x ; then cp $BUILD_ROOT/gtk2_ardour/SAE-de-nokeypad.bindings $Resources cp $BUILD_ROOT/gtk2_ardour/SAE-us-keypad.bindings $Resources cp $BUILD_ROOT/gtk2_ardour/SAE-us-nokeypad.bindings $Resources - cp $BUILD_ROOT/ardour_system_sae.rc $Resources/ardour_system.rc - echo cp $BUILD_ROOT/ardour_system_sae.rc $Resources/ardour_system.rc cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml echo cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml else - cp ../../ardour_system.rc $Resources/ardour_system.rc + cp ../../system_config $Resources/system_config cp ../../instant.xml $Resources/instant.xml echo cp ../../instant.xml $Resources/instant.xml fi -- 2.30.2