1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-15 15:11:12 +02:00

Revert to using a wrapper when starting Audacity

But, this time use a "C" wrapper as posited by Paul in:

   https://bugzilla.audacityteam.org/show_bug.cgi?id=543#c6

Doing so should bypass the execve()/decontruction issue and
still allow entitlements to work.

This also sets the build system to Legacy so that a "clean"
action will not produce:

   error: Could not delete '...' because it was not created by
          the build system.

And, I'm not sure why the deployment target was 10.9, but it
should have been 10.7.
This commit is contained in:
Leland Lucius
2020-02-02 02:46:53 -06:00
parent eb86a1eab7
commit 080b746b66
8 changed files with 182 additions and 92 deletions

View File

@@ -133,10 +133,10 @@ then
--options runtime \
--entitlements "${SRCROOT}/${CODE_SIGN_ENTITLEMENTS}" \
--sign "${CODESIGN_APP_IDENTITY}" \
"${DSTROOT}/Audacity.app"
$(find ${DSTROOT}/Audacity.app -type f ! -path "*help*")
# Create the ZIP archive for notarization
xcrun ditto -c -k --keepParent "${DSTROOT}" "${DSTROOT}.zip"
xcrun ditto -c -k --keepParent "${DSTROOT}/Audacity.app" "${DSTROOT}.zip"
# Send it off for notarization
notarize "${DSTROOT}.zip"

View File

@@ -1,5 +1,11 @@
#!/bin/sh
# Only want to run during a build
if [ -n "${ACTION}" -a "${ACTION}" != "build" ]
then
exit 0
fi
#
# Here we create empty xcconfig files if they do not exist. Otherwise,
# the build will fail.
@@ -20,12 +26,12 @@ done
#
cd ${TOPLEVEL}
mkdir -p mac/build
eval $(g++ -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}')
eval $(g++ -Wno-deprecated -stdlib=libc++ -E -dM src/Audacity.h | awk '/#define *AUDACITY_(VERSION|RELEASE|REVISION|MODLEVEL) /{print $2 "=" $3}')
case $CONFIGURATION in
Debug|Debug64)
AUDACITY_EXECUTABLE=Audacity;;
AUDACITY_EXECUTABLE=Wrapper;;
*)
AUDACITY_EXECUTABLE=Audacity;;
AUDACITY_EXECUTABLE=Wrapper;;
esac
cat >mac/build/Info.plist.h <<EOF
#define AUDACITY_EXECUTABLE ${AUDACITY_EXECUTABLE}