[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac Makefile.in

[Tor Lillqvist (via logerrit)]

 Makefile.in  |    2 +-
 configure.ac |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 411c2f5fdede197e5b8e6d942e3b35e301b1a5e5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 19 22:04:21 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 19 21:30:25 2020 +0100

    Allow --enable-macosx-sandbox without the codesigning identities
    
    For cases where you just want "make test-install" to construct an app
    bundle that you will manipulate and then sign separately.
    
    Change-Id: Iad805618f74ec783ebc013a664f928511b388383
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106185
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/Makefile.in b/Makefile.in
index 17469f5387f0..2aa500ae53c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -348,7 +348,6 @@ ifeq ($(OS_FOR_BUILD),WNT)
 	cd $(SRCDIR)/instsetoo_native && $(MAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
 	@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
-ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 #
 # Create Resources/*.lproj directories for languages supported by macOS
 	set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
@@ -377,6 +376,7 @@ ifneq ($(ENABLE_MACOSX_SANDBOX),)
 	rm $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/MacOS/unoinfo
 endif
 #
+ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 # Then use the macosx-codesign-app-bundle script
 	@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app
 endif
diff --git a/configure.ac b/configure.ac
index 2da3ac32e21a..0d08e29fb0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3096,11 +3096,9 @@ if test $_os = Darwin; then
 
     AC_MSG_CHECKING([whether to sandbox the application])
 
-    if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
-        AC_MSG_ERROR([macOS sandboxing requires code signing])
-    elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then
+    if test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then
         AC_MSG_ERROR([macOS sandboxing (actually App Store rules) disallows use of Java])
-    elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
+    elif test "$enable_macosx_sandbox" = yes; then
         ENABLE_MACOSX_SANDBOX=TRUE
         AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX)
         AC_MSG_RESULT([yes])