diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-11-19 22:04:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2020-12-13 17:20:05 +0200 |
| commit | 955f15cb2b4b3843b35cea00c008e7735ed5d1fe (patch) | |
| tree | 403121e66c601512d50b38e1404a35c573542bfa | |
| parent | 5f5008362381069851c403e94f6158dbed6bee7f (diff) | |
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@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106260
Tested-by: Jenkins
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 6af416b8a2f9..cc08afb4a5e8 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 75cb06aff732..e5d573f63d4d 100644 --- a/configure.ac +++ b/configure.ac @@ -3094,11 +3094,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]) |