diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-01-12 01:33:05 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2017-01-14 21:17:08 +0000 |
| commit | 7a63fc125c59ba3b7880a94fc038f2f24ca7e353 (patch) | |
| tree | c400e24208a1df1324daf91f8dc94c80e02f9c03 | |
| parent | tdf#105017 Crash when click a "New Theme..." in Gallery on detached SideBar (diff) | |
| download | core-7a63fc125c59ba3b7880a94fc038f2f24ca7e353.tar.gz core-7a63fc125c59ba3b7880a94fc038f2f24ca7e353.zip | |
CodesignRules.plist was removed in 615fae2f67028f3c5c51c70c77dbaa9b9f3856d6
Change-Id: Ibde5189ecf09ec8dfaf3223683c5480974084865
(cherry picked from commit 3e7e4df5a47b8d94ab86a8d6d0df38b1f282f980)
Reviewed-on: https://gerrit.libreoffice.org/33070
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index e7942eb693e5..c48f60e20f45 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -28,10 +28,7 @@ if test -n "$ENABLE_MACOSX_SANDBOX"; then # through that. I think. other_files='' else - # In a non-sandboxed build (distributed outside the App Store) - # we traditionally have use --resource-rules. Let's not touch that? - resource_rules="--resource-rules $SRCDIR/setup_native/source/mac/CodesignRules.plist" - # And there we then want to sign data files, too, hmm. + # We then want to sign data files, too, hmm. other_files="\ -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \ -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name 'LICENSE.html' \ @@ -109,6 +106,6 @@ done id=`echo ${PRODUCTNAME} | tr ' ' '-'` -codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" $resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE" +codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE" exit 0 |