Fix ardour2 -> ardour3 issues.

git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 36 insertions, 36 deletions

diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb
index 83f07c08ae..a59cb6f688 100755
--- a/tools/osx_packaging/app_build.rb
+++ b/tools/osx_packaging/app_build.rb
@@ -191,56 +191,56 @@ if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
   lipo_platforms_recurse(i386_libdir, ppc_libdir, "lib")
   lipo_platforms_recurse(i386_bindir+'/ardour', ppc_bindir+'/ardour', "bin/ardour")
 
-  # remove existing Ardour2.app
-  `rm -rf Ardour2.app`
+  # remove existing Ardour3.app
+  `rm -rf Ardour3.app`
 
-  $stdout.print("\nRunning Playtpus to create Ardour2.app  ...\n");
+  $stdout.print("\nRunning Playtpus to create Ardour3.app  ...\n");
 
-  `/usr/local/bin/platypus -D -X 'ardour' -a 'Ardour2' -t 'shell' -o 'None' -u 'Paul Davis' -i '/bin/sh' -V "#{version}" -s 'ArDr' -I 'org.ardour.Ardour2' -f 'bin' -f 'lib' -i 'Ardour2.icns' -f 'MenuBar.nib' -f 'ProgressWindow.nib' -f 'init' -f 'openDoc' 'script' 'Ardour2.app'`
+  `/usr/local/bin/platypus -D -X 'ardour' -a 'Ardour3' -t 'shell' -o 'None' -u 'Paul Davis' -i '/bin/sh' -V "#{version}" -s 'ArDr' -I 'org.ardour.Ardour3' -f 'bin' -f 'lib' -i 'Ardour3.icns' -f 'MenuBar.nib' -f 'ProgressWindow.nib' -f 'init' -f 'openDoc' 'script' 'Ardour3.app'`
 
-  $stdout.print("\nCopying other stuff to Ardour2.app  ...\n");
+  $stdout.print("\nCopying other stuff to Ardour3.app  ...\n");
 
-  if not File.exist?("Ardour2.app/Contents/Resources/etc") then
-    Dir.mkdir "Ardour2.app/Contents/Resources/etc" 
+  if not File.exist?("Ardour3.app/Contents/Resources/etc") then
+    Dir.mkdir "Ardour3.app/Contents/Resources/etc" 
   end
 
-  if not File.exist?("Ardour2.app/Contents/Resources/etc/ardour2") then
-    Dir.mkdir "Ardour2.app/Contents/Resources/etc/ardour2" 
+  if not File.exist?("Ardour3.app/Contents/Resources/etc/ardour3") then
+    Dir.mkdir "Ardour3.app/Contents/Resources/etc/ardour3" 
   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/ardour.bindings ../../gtk2_ardour/ardour.colors ../../gtk2_ardour/ardour.menus Ardour3.app/Contents/Resources/etc/ardour3/`
+  `cp ../../ardour.rc ../../ardour_system.rc Ardour3.app/Contents/Resources/etc/ardour3/`
+  `cp ardour3_mac_ui.rc Ardour3.app/Contents/Resources/etc/ardour3/ardour3_ui.rc`
 
   # copy other etc stuff
-  if not File.exist?("Ardour2.app/Contents/Resources/etc/gtk-2.0") then
-    `cp -R etc/gtk-2.0 Ardour2.app/Contents/Resources/etc/`
+  if not File.exist?("Ardour3.app/Contents/Resources/etc/gtk-2.0") then
+    `cp -R etc/gtk-2.0 Ardour3.app/Contents/Resources/etc/`
   end
-  if not File.exist?("Ardour2.app/Contents/Resources/etc/pango") then
-    `cp -R etc/pango Ardour2.app/Contents/Resources/etc/`
+  if not File.exist?("Ardour3.app/Contents/Resources/etc/pango") then
+    `cp -R etc/pango Ardour3.app/Contents/Resources/etc/`
   end
-  if not File.exist?("Ardour2.app/Contents/Resources/etc/fonts") then
-    `cp -R /opt/local/etc/fonts Ardour2.app/Contents/Resources/etc/`
+  if not File.exist?("Ardour3.app/Contents/Resources/etc/fonts") then
+    `cp -R /opt/local/etc/fonts Ardour3.app/Contents/Resources/etc/`
   end
 
-  if not File.exist?("Ardour2.app/Contents/Resources/etc/profile.d") then
-    `cp -R etc/profile.d Ardour2.app/Contents/Resources/etc/`
+  if not File.exist?("Ardour3.app/Contents/Resources/etc/profile.d") then
+    `cp -R etc/profile.d Ardour3.app/Contents/Resources/etc/`
   end
 
   # share stuff
 
-  if not File.exist?("Ardour2.app/Contents/Resources/share") then
-    Dir.mkdir "Ardour2.app/Contents/Resources/share"
+  if not File.exist?("Ardour3.app/Contents/Resources/share") then
+    Dir.mkdir "Ardour3.app/Contents/Resources/share"
   end
 
-  if not File.exist?("Ardour2.app/Contents/Resources/share/ardour2") then
-    Dir.mkdir "Ardour2.app/Contents/Resources/share/ardour2"
-    Dir.mkdir "Ardour2.app/Contents/Resources/share/ardour2/templates"
-    `cp -R  ../../gtk2_ardour/icons ../../gtk2_ardour/pixmaps ../../gtk2_ardour/splash.png Ardour2.app/Contents/Resources/share/ardour2/`
-    `cp ../../templates/*.template Ardour2.app/Contents/Resources/share/ardour2/templates/` 
+  if not File.exist?("Ardour3.app/Contents/Resources/share/ardour3") then
+    Dir.mkdir "Ardour3.app/Contents/Resources/share/ardour3"
+    Dir.mkdir "Ardour3.app/Contents/Resources/share/ardour3/templates"
+    `cp -R  ../../gtk2_ardour/icons ../../gtk2_ardour/pixmaps ../../gtk2_ardour/splash.png Ardour3.app/Contents/Resources/share/ardour3/`
+    `cp ../../templates/*.template Ardour3.app/Contents/Resources/share/ardour3/templates/` 
   end
 
   # go through and recursively remove any .svn dirs in the bundle
-  svndirs = `find Ardour2.app -name .svn -type dir`.split("\n")
+  svndirs = `find Ardour3.app -name .svn -type dir`.split("\n")
   svndirs.each do |svndir|
     `rm -rf #{svndir}`
   end
@@ -248,7 +248,7 @@ if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
   # make DMG
   `rm -rf macdist`
   Dir.mkdir("macdist")
-  `cp -r README.rtf COPYING Ardour2.app macdist/`
+  `cp -r README.rtf COPYING Ardour3.app macdist/`
   dmgname = "Ardour-#{version}"
   `rm -f #{dmgname}.dmg`
   $stdout.print("\nCreating DMG\n")
diff --git a/tools/osx_packaging/bin/exporter b/tools/osx_packaging/bin/exporter
index 0ac0370c82..d0bed83b27 100755
--- a/tools/osx_packaging/bin/exporter
+++ b/tools/osx_packaging/bin/exporter
@@ -18,11 +18,11 @@ 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 ARDOUR3_UI_RC=ardour3_ui.rc
 export ARDOUR_CONFIG_PATH="$TOP/etc"
 export ARDOUR_MODULE_PATH="$TOP/lib/"
 export ARDOUR_DATA_PATH="$TOP/share"
-export ARDOUR_GLADE_PATH="$TOP/share/ardour2/glade"
+export ARDOUR_GLADE_PATH="$TOP/share/ardour3/glade"
 
 export ARDOUR_PATH="$TOP/share/ardour/icons:$TOP/share/ardour/pixmaps"
 
@@ -41,6 +41,6 @@ sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \
     > "$ETC/gdk-pixbuf.loaders"
 
 # to prevent complaining
-mkdir -p "$HOME/.ardour2/templates"
+mkdir -p "$HOME/.ardour3/templates"
 
 exec "$CWD/ardour" "$@"
diff --git a/tools/osx_packaging/script b/tools/osx_packaging/script
index b003337418..4f927c2aa5 100755
--- a/tools/osx_packaging/script
+++ b/tools/osx_packaging/script
@@ -4,12 +4,12 @@
 
 if [ ! -x /Applications/Utilities/X11.app ] ; then
     if [ -f /usr/include/X11/X.h ] ; then
-	osascript -e 'tell application "Ardour2"
+	osascript -e 'tell application "Ardour3"
 display dialog "You have installed the X11 SDK, but not X11 itself.\
 Please install X11 before running Ardour" buttons["OK"]
 end tell'
     else
-	osascript -e 'tell application "Ardour2"
+	osascript -e 'tell application "Ardour3"
 display dialog "Please install X11 before running Ardour" buttons["OK"]
 end tell'
     fi
@@ -17,7 +17,7 @@ end tell'
 fi
 
 if [ ! -x /usr/local/bin/jackd -a ! -x /usr/bin/jackd ] ; then
-    osascript -e 'tell application "Ardour2"
+    osascript -e 'tell application "Ardour3"
 display dialog "You do not appear to have JACK installed.\nPlease install it before running Ardour" buttons["OK"]
 end tell'
     exit 1
diff --git a/tools/osx_packaging/startup_script b/tools/osx_packaging/startup_script
index c7b9b5acf8..7482283521 100644
--- a/tools/osx_packaging/startup_script
+++ b/tools/osx_packaging/startup_script
@@ -21,4 +21,4 @@ fi
 # in folders likes /home/user/Frank's Wild Years
 
 CWD="`/usr/bin/dirname \"$0\"`"
-exec "$CWD/Ardour2.bin" "$*"
+exec "$CWD/Ardour3.bin" "$*"