Makefile.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2cfe8412300a9ffe68228e0faf2c36eb1037cb6b
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Nov 14 17:13:48 2017 +0200
Don't bother with unoinfo either in the sandboxed app bundle
Note: Only for the ENABLE_MACOSX_SANDBOX case. Does not affect a
regular signed build.
Change-Id: I296ebdd5de075c1efbd198c671a3ec082681deb4
Reviewed-on: https://gerrit.libreoffice.org/44728
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 327ad42f4b641f37cf4dd9936346bc386252669a)
diff --git a/Makefile.in b/Makefile.in
index 0643277fed80..c5739ce976b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -341,9 +341,10 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
ifneq ($(ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal binary and unopkg script that we don't want
+# Remove the gengal binary and unopkg and unoinfo scripts that we don't want
rm
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal
rm
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg
+ rm
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unoinfo
endif
#
# Then use the macosx-codesign-app-bundle script
commit 59157f89f70e6e99c1f3a9ad37004a2dc6d5a7c4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed May 10 15:21:02 2017 +0200
typo
Change-Id: If5876ca8ecb8e6c6fe1135ddd0d1aa31ebfc47ca
Reviewed-on: https://gerrit.libreoffice.org/37468
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit d4e4c85d3cdf9faf678ea43e6a29e35bee0bc371)
diff --git a/Makefile.in b/Makefile.in
index 50d9dc0cfb09..0643277fed80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -340,7 +340,7 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
# And with it removed, presumably the other stuff in the Python
lib/python3.3/config-3.3m probably does not make sense either.
rm -rf
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
-ifneq ($ENABLE_MACOSX_SANDBOX),)
+ifneq ($(ENABLE_MACOSX_SANDBOX),)
# Remove the gengal binary and unopkg script that we don't want
rm
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/gengal
rm
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unopkg
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
