[Libreoffice-commits] core.git: solenv/bin

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 62bf3cf458c6828cce74876f21fd6b2e31045e00
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun May 24 19:39:37 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 25 00:09:35 2020 +0200

    Correct comments
    
    The --enable-canonical-installation-tree-structure option is gone. We
    always use a "canonical" app bundle structure (with MacOS, Frameworks,
    Library, and Resources) on macOS since
    6492c8576e0393f7ee548cd938e84c80e8d37127 in 2014.
    
    Change-Id: I6cbd3c5141aba643bc05bfa7d4de1e7d73a14112
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94761
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 8a8f8445c629..2353032e3a8a 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -30,8 +30,7 @@ entitlements=
 if test -n "$ENABLE_MACOSX_SANDBOX"; then
     # In a sandboxed build executables need the entitlements
     entitlements="--entitlements $BUILDDIR/lo.xcent"
-    # We use --enable-canonical-installation-tree-structure so all
-    # data files in Resources are included in the app bundle signature
+    # All data files are in Resources and included in the app bundle signature
     # through that. I think.
     other_files=''
 else
@@ -144,9 +143,7 @@ done
 
 # Sign the app bundle as a whole which means (re-)signing the
 # CFBundleExecutable from Info.plist, i.e. soffice, plus the contents
-# of the Resources tree (which unless you used
-# --enable-canonical-installation-tree-structure is not much, far from
-# all of our non-code "resources").
+# of the Resources tree.
 #
 # At this stage we also attach the entitlements in the sandboxing case
 #