From 55d7ba2a4906b0f5cb21591e42a37323a7f579ee Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 14 Nov 2008 22:10:44 +0000
Subject: more version string fixups

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4177 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 tools/osx_packaging/InfoPlist.strings.in        |  4 ++++
 tools/osx_packaging/Resources/InfoPlist.strings |  4 ----
 tools/osx_packaging/osx_build                   | 10 +++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 tools/osx_packaging/InfoPlist.strings.in
 delete mode 100644 tools/osx_packaging/Resources/InfoPlist.strings

(limited to 'tools')

diff --git a/tools/osx_packaging/InfoPlist.strings.in b/tools/osx_packaging/InfoPlist.strings.in
new file mode 100644
index 0000000000..1ee76ac4c0
--- /dev/null
+++ b/tools/osx_packaging/InfoPlist.strings.in
@@ -0,0 +1,4 @@
+CFBundleName = "@APPNAME@";
+CFBundleShortVersionString = "@VERSION@";
+CFBundleGetInfoString = "@APPNAME@ v @VERSION@ Copyright 2001-2008 Paul Davis";
+NSHumanReadableCopyright = "Copyright 2001-2008 Paul Davis.";
diff --git a/tools/osx_packaging/Resources/InfoPlist.strings b/tools/osx_packaging/Resources/InfoPlist.strings
deleted file mode 100644
index 5349427ee3..0000000000
--- a/tools/osx_packaging/Resources/InfoPlist.strings
+++ /dev/null
@@ -1,4 +0,0 @@
-CFBundleName = "Ardour2";
-CFBundleShortVersionString = "#{version}";
-CFBundleGetInfoString = "Ardour2 version #{version} Copyright 2001-2008 Paul Davis";
-NSHumanReadableCopyright = "Copyright 2001-2008 Paul Davis.";
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 60fec9ca8d..6dd798f427 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -87,6 +87,7 @@ mkdir -p $Etc
 # maybe set variables
 env=""
 if test x$SAE != x ; then
+    appname="Ardour2/SAE"
     env="$env<key>ARDOUR_SAE</key><string>true</string>"
     #
     # current default for SAE version is German keyboard layout without a keypad
@@ -94,6 +95,8 @@ if test x$SAE != x ; then
     env="$env<key>ARDOUR_KEYBOARD_LAYOUT</key><string>de-nokeypad</string>"
     env="$env<key>ARDOUR_UI_CONF</key><string>ardour2_ui_sae.conf</string>"
     env="$env<key>ARDOUR2_UI_RC</key><string>ardour2_ui_dark_sae.rc</string>"
+else
+    appname="Ardour2"
 fi
 
 #
@@ -112,8 +115,13 @@ env="<key>LSEnvironment</key><dict><key>ARDOUR_BUNDLED</key><string>true</string
 
 # edit plist
 sed -e "s?@ENV@?$env?g" \
-    -e "s?@VERSION@?$svn_version?g" \
+    -e "s?@VERSION@?$release_version/$svn_version?g" \
     -e "s?@INFOSTRING@?$info_string?g" < Info.plist.in > Info.plist
+# and plist strings
+sed -e "s?@APPNAME@?$appname?" \
+    -e "s?@ENV@?$env?g" \
+    -e "s?@VERSION@?$release_version/$svn_version?g" \
+    -e "s?@INFOSTRING@?$info_string?g" < InfoPlist.strings.in > Resources/InfoPlist.strings
 
 # copy static files
 
-- 
cgit v1.2.3