diff options
-rw-r--r-- | tools/osx_packaging/Ardour.icns (renamed from tools/osx_packaging/Ardour3.icns) | bin | 212599 -> 212599 bytes | |||
-rw-r--r-- | tools/osx_packaging/Info.plist.in | 4 | ||||
-rw-r--r-- | tools/osx_packaging/InfoPlist.strings.in | 4 | ||||
-rwxr-xr-x | tools/osx_packaging/osx_build | 24 | ||||
-rw-r--r-- | tools/osx_packaging/startup_script | 2 |
5 files changed, 20 insertions, 14 deletions
diff --git a/tools/osx_packaging/Ardour3.icns b/tools/osx_packaging/Ardour.icns Binary files differindex 3fa4722234..3fa4722234 100644 --- a/tools/osx_packaging/Ardour3.icns +++ b/tools/osx_packaging/Ardour.icns diff --git a/tools/osx_packaging/Info.plist.in b/tools/osx_packaging/Info.plist.in index d210150ed2..3fffd4d7ac 100644 --- a/tools/osx_packaging/Info.plist.in +++ b/tools/osx_packaging/Info.plist.in @@ -23,13 +23,13 @@ </dict> </array> <key>CFBundleExecutable</key> - <string>Ardour3</string> + <string>@EXECUTABLE@</string> <key>CFBundleGetInfoString</key> <string>@INFOSTRING@</string> <key>CFBundleIconFile</key> <string>appIcon.icns</string> <key>CFBundleIdentifier</key> - <string>org.ardour.Ardour3</string> + <string>org.ardour.@IDSUFFIX@</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> diff --git a/tools/osx_packaging/InfoPlist.strings.in b/tools/osx_packaging/InfoPlist.strings.in index 04b906fee7..fff8210d94 100644 --- a/tools/osx_packaging/InfoPlist.strings.in +++ b/tools/osx_packaging/InfoPlist.strings.in @@ -1,4 +1,4 @@ CFBundleName = "@APPNAME@"; CFBundleShortVersionString = "@VERSION@"; -CFBundleGetInfoString = "@APPNAME@ v @VERSION@ Copyright 2001-2011 Paul Davis"; -NSHumanReadableCopyright = "Copyright 2001-20011 Paul Davis."; +CFBundleGetInfoString = "@APPNAME@ v @VERSION@ Copyright 2001-2015 Paul Davis"; +NSHumanReadableCopyright = "Copyright 2001-2015 Paul Davis."; diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 1673db3622..611c6a2300 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -99,7 +99,7 @@ fi # setup directory structure -APPDIR=${APPNAME}.app +APPDIR=${APPNAME}${major_version}.app APPROOT=$APPDIR/Contents Frameworks=$APPROOT/lib Resources=$APPROOT/Resources @@ -163,7 +163,8 @@ mkdir -p $PatchFiles # maybe set variables env="" if test x$SAE != x ; then - appname="Ardour3/SAE" + appname="Ardour${major_version}-SAE" + EXECUTABLE=${appname} env="$env<key>ARDOUR_SAE</key><string>true</string>" # # current default for SAE version is German keyboard layout without a keypad @@ -172,6 +173,7 @@ if test x$SAE != x ; then env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui_sae.conf</string>" elif test x$MIXBUS != x ; then appname="Mixbus" + EXECUTABLE=${appname}${major_version} env="$env<key>ARDOUR_MIXBUS</key><string>true</string>" # # current default for MIXBUS version is US keyboard layout without a keypad @@ -179,7 +181,8 @@ elif test x$MIXBUS != x ; then env="$env<key>ARDOUR_KEYBOARD_LAYOUT</key><string>us-nokeypad</string>" env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui.conf</string>" else - appname="Ardour3" + appname="Ardour${major_version}" + EXECUTABLE=${appname} fi # @@ -192,10 +195,13 @@ env="$env<key>DYLIB_FALLBACK_LIBRARY_PATH</key><string>/usr/local/lib:/opt/lib</ env="<key>LSEnvironment</key><dict>$env<key>ARDOUR_BUNDLED</key><string>true</string></dict>" + # edit plist sed -e "s?@ENV@?$env?g" \ -e "s?@VERSION@?$release_version?g" \ - -e "s?@INFOSTRING@?$info_string?g" < Info.plist.in > Info.plist + -e "s?@INFOSTRING@?$info_string?g" \ + -e "s?@IDSUFFIX@?$EXECUTABLE?g" \ + -e "s?@EXECUTABLE@?$EXECUTABLE?g" < Info.plist.in > Info.plist # and plist strings sed -e "s?@APPNAME@?$appname?" \ -e "s?@ENV@?$env?g" \ @@ -213,14 +219,14 @@ rm -f Resources/InfoPlist.strings # # if we build a bundle without jack, then -# make the Ardour3 executable a helper +# make the Ardour executable a helper # script that checks to see if JACK is # installed. # -cp startup_script $APPROOT/MacOS/Ardour3 -chmod 775 $APPROOT/MacOS/Ardour3 -MAIN_EXECUTABLE=Ardour3.bin +cp startup_script $APPROOT/MacOS/$EXECUTABLE +chmod 775 $APPROOT/MacOS/$EXECUTABLE +MAIN_EXECUTABLE=Ardour.bin ## used in startup_script echo "Copying ardour executable ...." cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTABLE @@ -230,7 +236,7 @@ if test x$SAE != x ; then elif test x$MIXBUS != x ; then cp Mixbus.icns $Resources/appIcon.icns else - cp Ardour3.icns $Resources/appIcon.icns + cp Ardour.icns $Resources/appIcon.icns fi cp typeArdour.icns $Resources/ diff --git a/tools/osx_packaging/startup_script b/tools/osx_packaging/startup_script index f807dd2b59..75ed7200d1 100644 --- a/tools/osx_packaging/startup_script +++ b/tools/osx_packaging/startup_script @@ -27,4 +27,4 @@ export PREBUNDLE_ENV="$(env)" # in folders likes /home/user/Frank's Wild Years CWD="`/usr/bin/dirname \"$0\"`" -exec "$CWD/Ardour3.bin" "$@" +exec "$CWD/Ardour.bin" "$@" |