[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - solenv/bin

[Tor Lillqvist]

 solenv/bin/macosx-codesign-app-bundle |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 7a63fc125c59ba3b7880a94fc038f2f24ca7e353
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jan 12 01:33:05 2017 +0200

    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 at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index e7942eb..c48f60e 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