smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

OSX bundle updates for 4.X[-rcX]

Browse source
This commit is contained in:
Robin Gareus 2015-03-23 13:33:08 +01:00
parent 20985dfdf9
commit 4b05417d2f
5 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

0
tools/osx_packaging/Ardour3.icns → tools/osx_packaging/Ardour.icns
View file

4
tools/osx_packaging/Info.plist.in
View file

@ -23,13 +23,13 @@
</dict> </dict>
</array> </array>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Ardour3</string> <string>@EXECUTABLE@</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>@INFOSTRING@</string> <string>@INFOSTRING@</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>appIcon.icns</string> <string>appIcon.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.ardour.Ardour3</string> <string>org.ardour.@IDSUFFIX@</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

4
tools/osx_packaging/InfoPlist.strings.in
View file

@ -1,4 +1,4 @@
CFBundleName = "@APPNAME@"; CFBundleName = "@APPNAME@";
CFBundleShortVersionString = "@VERSION@"; CFBundleShortVersionString = "@VERSION@";
CFBundleGetInfoString = "@APPNAME@ v @VERSION@ Copyright 2001-2011 Paul Davis"; CFBundleGetInfoString = "@APPNAME@ v @VERSION@ Copyright 2001-2015 Paul Davis";
NSHumanReadableCopyright = "Copyright 2001-20011 Paul Davis."; NSHumanReadableCopyright = "Copyright 2001-2015 Paul Davis.";

24
tools/osx_packaging/osx_build
View file

@ -99,7 +99,7 @@ fi
# setup directory structure # setup directory structure
APPDIR=${APPNAME}.app APPDIR=${APPNAME}${major_version}.app
APPROOT=$APPDIR/Contents APPROOT=$APPDIR/Contents
Frameworks=$APPROOT/lib Frameworks=$APPROOT/lib
Resources=$APPROOT/Resources Resources=$APPROOT/Resources
@ -163,7 +163,8 @@ mkdir -p $PatchFiles
# maybe set variables # maybe set variables
env="" env=""
if test x$SAE != x ; then 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>" env="$env<key>ARDOUR_SAE</key><string>true</string>"
# #
# current default for SAE version is German keyboard layout without a keypad # 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>" env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui_sae.conf</string>"
elif test x$MIXBUS != x ; then elif test x$MIXBUS != x ; then
appname="Mixbus" appname="Mixbus"
EXECUTABLE=${appname}${major_version}
env="$env<key>ARDOUR_MIXBUS</key><string>true</string>" env="$env<key>ARDOUR_MIXBUS</key><string>true</string>"
# #
# current default for MIXBUS version is US keyboard layout without a keypad # 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_KEYBOARD_LAYOUT</key><string>us-nokeypad</string>"
env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui.conf</string>" env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui.conf</string>"
else else
appname="Ardour3" appname="Ardour${major_version}"
EXECUTABLE=${appname}
fi 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>" env="<key>LSEnvironment</key><dict>$env<key>ARDOUR_BUNDLED</key><string>true</string></dict>"
# edit plist # edit plist
sed -e "s?@ENV@?$env?g" \ sed -e "s?@ENV@?$env?g" \
-e "s?@VERSION@?$release_version?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 # and plist strings
sed -e "s?@APPNAME@?$appname?" \ sed -e "s?@APPNAME@?$appname?" \
-e "s?@ENV@?$env?g" \ -e "s?@ENV@?$env?g" \
@ -213,14 +219,14 @@ rm -f Resources/InfoPlist.strings
# #
# if we build a bundle without jack, then # 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 # script that checks to see if JACK is
# installed. # installed.
# #
cp startup_script $APPROOT/MacOS/Ardour3 cp startup_script $APPROOT/MacOS/$EXECUTABLE
chmod 775 $APPROOT/MacOS/Ardour3 chmod 775 $APPROOT/MacOS/$EXECUTABLE
MAIN_EXECUTABLE=Ardour3.bin MAIN_EXECUTABLE=Ardour.bin ## used in startup_script
echo "Copying ardour executable ...." echo "Copying ardour executable ...."
cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_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 elif test x$MIXBUS != x ; then
cp Mixbus.icns $Resources/appIcon.icns cp Mixbus.icns $Resources/appIcon.icns
else else
cp Ardour3.icns $Resources/appIcon.icns cp Ardour.icns $Resources/appIcon.icns
fi fi
cp typeArdour.icns $Resources/ cp typeArdour.icns $Resources/

2
tools/osx_packaging/startup_script
View file

@ -27,4 +27,4 @@ export PREBUNDLE_ENV="$(env)"
# in folders likes /home/user/Frank's Wild Years # in folders likes /home/user/Frank's Wild Years
CWD="`/usr/bin/dirname \"$0\"`" CWD="`/usr/bin/dirname \"$0\"`"
exec "$CWD/Ardour3.bin" "$@" exec "$CWD/Ardour.bin" "$@"