macOS: Application bundle fixes.

Copy Sparkle.framework correctly. Force signing so that we replace
Sparkle's signature with ours.

In osx-app.sh, don't sign a file or framework if it's already signed.

Fix the osx-dmg.sh usage message while we're here.

Change-Id: I697073d234958e1d8386650935a132237ad88f64
Reviewed-on: https://code.wireshark.org/review/35095
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2019-11-15 11:32:25 -08:00
parent 7590d08db1
commit 1cc5b68ac9
2 changed files with 3 additions and 2 deletions

View File

@ -231,7 +231,7 @@ fi
/usr/bin/install_name_tool -delete_rpath "$qt_frameworks_dir" $pkgexec/Wireshark
if [ -d "$sparkle_frameworks_dir" ] ; then
cp -r "$sparkle_frameworks_dir" "$pkglib" || exit 1
cp -R "$sparkle_frameworks_dir" "$pkglib" || exit 1
fi
# NOTE: we must rpathify *all* files, *including* Qt libraries etc.,
@ -466,6 +466,7 @@ codesign_file () {
# https://developer.apple.com/documentation/security/hardened_runtime_entitlements?language=objc
codesign \
--sign "Developer ID Application: $CODE_SIGN_IDENTITY" \
--force \
--options runtime \
--entitlements "@CMAKE_SOURCE_DIR@/packaging/macosx/entitlements.plist" \
--timestamp \

View File

@ -23,7 +23,7 @@ OPTIONS
Display this help message.
Icons are positioned and the background image is set in
arrange_dmg.applescript.
dmgbuild-settings.py.in.
"
}