diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-15 01:52:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-10 16:47:38 +0300 |
| commit | 12b047165eef7bc48065ab6604f7705966a92586 (patch) | |
| tree | 821f98e6ab1def0c455483d515d2384058ca8f4c /solenv | |
| parent | 4867113c0078037d0549e635a6b93aa4ddfad99c (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.
(cherry picked from commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd)
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index d21031ad8304..de5ec792e033 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -84,11 +84,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 |