summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-10-23 22:55:10 +0200
committerRobin Gareus <robin@gareus.org>2019-10-23 22:55:10 +0200
commit81ef8028696ac380f49d80322d8d7a4f5191d799 (patch)
treeb39c94f7d74b7fda3e565c6fc712a20731471684 /tools
parent9cae196a047b87252c3f6e80716865a78e3edf31 (diff)
Update MacOS installer to directly run Ardour w/o script wrapper
Diffstat (limited to 'tools')
-rwxr-xr-xtools/osx_packaging/osx_build13
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 0e471d8cc6..4aaa415f38 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -224,16 +224,21 @@ cp -R Resources $APPROOT
rm -f Info.plist
rm -f Resources/InfoPlist.strings
-#
# if we build a bundle without jack, then
# make the Ardour executable a helper
# script that checks to see if JACK is
# installed.
#
+#cp startup_script $APPROOT/MacOS/$EXECUTABLE
+#chmod 775 $APPROOT/MacOS/$EXECUTABLE
+#MAIN_EXECUTABLE=Ardour.bin ## used in startup_script
+
+# For Catalina we cannot use a shell script wrapper
+# the binary mentioned in the .plist must match
+# the actual executable, otherwise the user is
+# not prompted to grant permissions to access the audio-device
-cp startup_script $APPROOT/MacOS/$EXECUTABLE
-chmod 775 $APPROOT/MacOS/$EXECUTABLE
-MAIN_EXECUTABLE=Ardour.bin ## used in startup_script
+MAIN_EXECUTABLE=$EXECUTABLE
echo "Copying ardour executable ...."
cp $BUILD_ROOT/gtk2_ardour/ardour-$release_version $APPROOT/MacOS/$MAIN_EXECUTABLE