diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 18:19:11 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 22:02:38 -0500 |
commit | 9ac551abab0fd80d3e61cb084d2e70c4ecc78310 (patch) | |
tree | 5b6bfc2b7d7cb3f765577d5161ee178b4adce8ae /tools | |
parent | 624a86c39d0a22439c797d88c6defe28e55ab806 (diff) |
another metric ton of color work
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/linux_packaging/build | 22 | ||||
-rwxr-xr-x | tools/osx_packaging/osx_build | 23 |
2 files changed, 15 insertions, 30 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index f1bc92733d..116b20b468 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -537,21 +537,23 @@ find $APPLIB/ -name "*.so*" | xargs chmod a+rx echo "Copying other stuff to $APPDIR ..." # these are all generated by waf -#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 ../../system_config $Etc/system_config cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Etc cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc -# these are copied straight from the source tree +# Copied directly from source tree -cp ../../instant.xml $Etc/instant.xml -cp ../../gtk2_ardour/step_editing.bindings $Etc -cp ../../gtk2_ardour/mixer.bindings $Etc +cp ../../system_config $Etc/system_config +cp ../../gtk2_ardour/dark.colors $Etc +cp ../../instant.xml $Shared/instant.xml +cp ../../gtk2_ardour/step_editing.bindings $Shared +cp ../../gtk2_ardour/mixer.bindings $Shared cp -r ../../gtk2_ardour/icons $Shared cp -r ../../gtk2_ardour/pixmaps $Shared - +cp -r ../../gtk2_ardour/splash.png $Shared +cp -r ../../gtk2_ardour/small-splash.png $Shared +cp -r ../../gtk2_ardour/ArdourMono.ttf $Shared # # put sooper sekrit ingredients here and they will be copied @@ -561,12 +563,6 @@ if [ -d specialSauce ] ; then cp -r specialSauce $Etc fi -# share stuff - -cp -R ../../gtk2_ardour/splash.png $Shared -cp -R ../../gtk2_ardour/small-splash.png $Shared -cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared - # install bundled LV2s to <app>/lib/LV2/ cp -R $BUILD_ROOT/libs/LV2 $APPLIB/ diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 6bbf6176a0..81892ccc46 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -443,30 +443,19 @@ echo "Copying other stuff to $APPDIR ..." #cp $BUILD_ROOT/gtk2_ardour/ergonomic-us.bindings $Resources cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings $Resources -cp ../../gtk2_ardour/mixer.bindings $Resources -cp ../../gtk2_ardour/step_editing.bindings $Resources cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Resources - -if test x$SAE != x ; then - cp $BUILD_ROOT/gtk2_ardour/SAE-de-keypad.bindings $Resources - 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/instant.xml.sae $Resources/instant.xml - echo cp $BUILD_ROOT/instant.xml.sae $Resources/instant.xml -else - cp ../../system_config $Resources/system_config - cp ../../instant.xml $Resources/instant.xml - echo cp ../../instant.xml $Resources/instant.xml -fi cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Resources cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources +# Copied directly from source tree +cp ../../system_config $Resources/system_config +cp ../../instant.xml $Resources/instant.xml +cp ../../gtk2_ardour/step_editing.bindings $Resources +cp ../../gtk2_ardour/mixer.bindings $Resources cp -r ../../gtk2_ardour/icons $Resources cp -r ../../gtk2_ardour/pixmaps $Resources - -# shared stuff +cp ../../gtk2_ardour/dark.colors $Resources cp -R ../../gtk2_ardour/splash.png $Shared cp -R ../../gtk2_ardour/small-splash.png $Shared cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared |