diff --git a/tools/osx_packaging/Info.plist.in b/tools/osx_packaging/Info.plist.in index d210150ed2..13413c21d7 100644 --- a/tools/osx_packaging/Info.plist.in +++ b/tools/osx_packaging/Info.plist.in @@ -23,7 +23,7 @@ CFBundleExecutable - Ardour3 + Tracks CFBundleGetInfoString @INFOSTRING@ CFBundleIconFile @@ -33,7 +33,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Ardour3 + Tracks CFBundlePackageType APPL CFBundleShortVersions diff --git a/tools/osx_packaging/Ardour3.icns b/tools/osx_packaging/Tracks.icns similarity index 100% rename from tools/osx_packaging/Ardour3.icns rename to tools/osx_packaging/Tracks.icns diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index ae1e97b58e..cbb8820068 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -46,7 +46,7 @@ while [ $# -gt 0 ] ; do SAE= ; WITH_LADSPA=1; STRIP= ; - PRODUCT_PKG_DIR=Ardour; + PRODUCT_PKG_DIR=Tracks; APPNAME=Tracks ; shift ;; --allinone) SAE= ; @@ -166,7 +166,7 @@ elif test x$MIXBUS != x ; then env="$envARDOUR_UI_CONFardour3_ui.conf" env="$envARDOUR3_UI_RCardour3_ui_dark.rc" else - appname="Ardour3" + appname="Tracks" fi # @@ -196,14 +196,14 @@ cp -R Resources $APPROOT # # if we build a bundle without jack, then -# make the Ardour3 executable a helper +# make the Tracks 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/Tracks +chmod 775 $APPROOT/MacOS/Tracks +MAIN_EXECUTABLE=Tracks.bin echo "Copying tracks executable ...." cp $BUILD_ROOT/gtk2_ardour/tracks $APPROOT/MacOS/$MAIN_EXECUTABLE @@ -213,11 +213,11 @@ 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 Tracks.icns $Resources/appIcon.icns fi cp typeArdour.icns $Resources/ if test x$STRIP != x ; then - strip $APPROOT/MacOS/Ardour3 + strip $APPROOT/MacOS/Tracks fi # copy locale files diff --git a/tools/osx_packaging/startup_script b/tools/osx_packaging/startup_script index 8e6ce2f48c..067aa82780 100644 --- a/tools/osx_packaging/startup_script +++ b/tools/osx_packaging/startup_script @@ -3,18 +3,6 @@ # # NOTE: Leopard appears not to set PATH for this script, so be absolutely certain # never to use any other program without fully specifying the path. -# -# this is used to detect a missing JACK install which -# is the most common thing causing startup crashes. -# - -if test ! -x /usr/local/bin/jackd -a ! -x /usr/bin/jackd ; then - /usr/bin/osascript -e 'tell application "Finder" -display dialog "You do not have JACK installed. Ardour will not run without it. See http://jackaudio.org/ for info" buttons["OK"] -end tell' - exit 1 -fi - # # Some versions of Audacity leave /usr/local/lib unreadable/unsearchable. Ardour will not be able to start up if this is # the case, because we need access to /usr/local/lib/libjack.dylib @@ -35,4 +23,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/Tracks.bin" "$@"