diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-05-20 08:50:12 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-06-07 22:08:50 +0200 |
| commit | 67b808eea02219ef51324f560e673e3aaaa3e736 (patch) | |
| tree | 594fc0bcfcdac9d6700c466028c27b4bd2be4d55 /desktop | |
| parent | 75dc3a54fca8b2dc775ba007190d8c2e188f1c0a (diff) | |
Set entitlements in non-release in $(INSTROOTBASE) and .dmg package
Also, when building a .dmg for macOS, skip codesigning for non-release
builds, both with and without the macOS sandbox, if there is no identity
set but set entitlements to allow Xcode's Instruments application to
connect to the application.
Lastly, add entitlements when building soffice in $(INSTROOTBASE) if
this is a non-release build.
Change-Id: I764bf5bd5d44e878669c4287906e6efd6aac593f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152655
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CustomTarget_soffice.mk | 19 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index d56f571628fe..4df29fc3cae3 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -9,6 +9,23 @@ $(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice)) +ifeq ($(OS), MACOSX) + +ifeq (,$(ENABLE_RELEASE_BUILD)) + +# Add entitlements if this is a non-release build. Just to be safe, +# this target will always be run and MACOSX_CODESIGNING_IDENTITY is +# set to empty as we don't want to sign $(INSTROOTBASE). Ignore +# failures as it appears that setting only entitlements can fail +# with certain macOS SDKs. +$(call gb_CustomTarget_get_target,desktop/soffice) : \ + $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice + -MACOSX_CODESIGNING_IDENTITY= $(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(INSTROOTBASE) + +endif + +else + $(call gb_CustomTarget_get_target,desktop/soffice) : \ $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh @@ -25,4 +42,6 @@ else endif $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) +endif + # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index fff879c83b0c..de56f3bd139f 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ Pagein_impress \ Pagein_writer \ ) \ - $(if $(filter-out MACOSX WNT,$(OS)),CustomTarget_soffice) \ + $(if $(filter-out WNT,$(OS)),CustomTarget_soffice) \ )) ifeq ($(USING_X11),TRUE) |