updated mac app_build script and exporter startup script for new UI rc semantics

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2229 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb
index 48d3837368089f6eff253f1a077466bf94469d29..5a3a3e682c541c149480e211e676c93e4eeb2979 100755 (executable)
--- a/tools/osx_packaging/app_build.rb
+++ b/tools/osx_packaging/app_build.rb
@@ -199,7 +199,9 @@ if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
   end
   `cp ../../gtk2_ardour/ardour.bindings ../../gtk2_ardour/ardour.colors ../../gtk2_ardour/ardour.menus Ardour2.app/Contents/Resources/etc/ardour2/`
   `cp ../../ardour.rc ../../ardour_system.rc Ardour2.app/Contents/Resources/etc/ardour2/`
-  `cp ardour2_mac_ui.rc Ardour2.app/Contents/Resources/etc/ardour2/ardour2_ui.rc`
+  `cp ../../gtk2_ardour/ardour2_ui_default.conf Ardour2.app/Contents/Resources/etc/ardour2/`
+  `cp ../../gtk2_ardour/ardour2_ui_light.rc Ardour2.app/Contents/Resources/etc/ardour2/`
+  `cp ../../gtk2_ardour/ardour2_ui_dark.rc Ardour2.app/Contents/Resources/etc/ardour2/`
 
   # copy other etc stuff
   if not File.exist?("Ardour2.app/Contents/Resources/etc/gtk-2.0") then

diff --git a/tools/osx_packaging/bin/exporter b/tools/osx_packaging/bin/exporter
index 41a2904ff93cd06350270c7474d963671025416a..decec66ad812cf4e43d09eed4b7fbf71512d65ae 100755 (executable)
--- a/tools/osx_packaging/bin/exporter
+++ b/tools/osx_packaging/bin/exporter
@@ -18,7 +18,7 @@ export "GS_LIB=$TOP/share/ghostscript/8.51/lib:$TOP/share/ghostscript/fonts"
 export LANG=`grep '\b'\`defaults read .GlobalPreferences AppleCollationOrder\`_\
        /usr/share/locale/locale.alias | sed -n 's/.*\(.._..\)\..*/\1/p;1q'`
 
-export ARDOUR2_UI_RC=ardour2_ui.rc
+#export ARDOUR2_UI_RC=ardour2_ui.rc
 export ARDOUR_CONFIG_PATH="$TOP/etc"
 export ARDOUR_MODULE_PATH="$TOP/lib/"
 export ARDOUR_DATA_PATH="$TOP/share"