Update MacOS installer to directly run Ardour w/o script wrapper
authorRobin Gareus <robin@gareus.org>
Wed, 23 Oct 2019 20:55:10 +0000 (22:55 +0200)
committerRobin Gareus <robin@gareus.org>
Wed, 23 Oct 2019 20:55:10 +0000 (22:55 +0200)
tools/osx_packaging/osx_build

index 0e471d8cc60e876aee7c41c21eea55af442de185..4aaa415f3821318efad18a4a26a2b1a32378d962 100755 (executable)
@@ -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