summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-15 01:52:17 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-15 08:56:59 +0300
commit41f2ebfbaa9fb06f56530b4a330fc029df87ecfd (patch)
treef04e3e33a0de752eca57669563eaed5e6ec050e9 /solenv
parent88be7b54c5be57c7ecabe200731262e24c0ca0a4 (diff)
The --resource-rules option in being deprecated
The documentation is a bit unclear yet, but I think it is safe to assume that Apple strongly wants sandboxed apps to have what we call ENABLE_MACOSX_MACLIKE_APP_STRUCTURE and to be signed without any special resource rules. Change-Id: I1409ccb6a3f9086d01af6ff318fe28536c1cebef
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/macosx-codesign-app-bundle9
1 files changed, 6 insertions, 3 deletions
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 2f22618882af..cdaa8e8f5358 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -89,11 +89,14 @@ done
# (bootstraprc and similar that the user might adjust and image files)
# See also https://developer.apple.com/library/mac/technotes/tn2206/
-if test "$ENABLE_MACOSX_SANDBOX" = "TRUE"; then
+id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
+
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
entitlements="--entitlements $BUILDDIR/lo.xcent"
+else
+ resource_rules="--resource-rules $SRCDIR/setup_native/source/mac/CodesignRules.plist"
fi
-id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" --resource-rules "$SRCDIR/setup_native/source/mac/CodesignRules.plist" --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" $resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE
exit 0