diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-20 01:01:09 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-06-11 14:26:29 +0200 |
| commit | f56af595612206ca04c1799d6b3b7dca5757a6f4 (patch) | |
| tree | ff609697e52aebe24fe42b9e9aec5c75164658ba | |
| parent | 274ac175a33730503815d998fd596bfabc4666fc (diff) | |
Skip some executables in the OS X sandboxed (Mac App Store) case
I doubt end-users will miss gengal.bin, regview, or regmerge.
(cherry picked from commit beb30bbd867f9a28878e0d004458c3507f6c0956)
Conflicts:
Repository.mk
(cherry picked from commit 72e8d549fae0aa6278a6b2d64cf65d4df8f27f94)
Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | registry/Module_registry.mk | 6 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 101334b38415..b94eec6be096 100644 --- a/Repository.mk +++ b/Repository.mk @@ -190,8 +190,10 @@ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - regmerge \ - regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index fb962c64c012..5f70ed9def8e 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ $(if $(filter-out $(OS),IOS), \ - Executable_regmerge \ - Executable_regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + Executable_regmerge \ + Executable_regview \ + ) \ StaticLibrary_registry_helper \ ) \ )) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 67dbe017d442..ab26b9f602a7 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_check_targets,svx,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq (,$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal \ $(if $(filter-out WNT,$(OS)), \ @@ -44,6 +45,7 @@ $(eval $(call gb_Module_add_targets,svx,\ Executable_pixelctl) \ )) endif +endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ |