Repository.mk | 2 +- cpputools/Module_cpputools.mk | 2 +- solenv/gbuild/Conditions.mk | 4 ++++ solenv/gbuild/Helper.mk | 4 +--- 4 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 692838e958310cb8497d4b4f8994bdaa5c0f1942 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Fri Jan 7 14:31:27 2022 +0100 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Sat Jan 8 12:04:09 2022 +0100 sp2bv is just used by the ODK on Windows And I should have tested gb_Helper_optionals_and. Inspecting the generated token for comparison doesn't result in gb_[T1]_[T2], as I expected. So first filter the token from BUILD_TYPE, then filter-out the result from the input token. If true, then both sets are equal == and. Change-Id: I74a324f766331b30a0af9c9bfd7c927c1d21df53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128115 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/Repository.mk b/Repository.mk index 7d5d0cf3546b..da11a60bb8cf 100644 --- a/Repository.mk +++ b/Repository.mk @@ -55,7 +55,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ propex \ regsvrex \ saxparser \ - sp2bv \ svidl \ $(if $(ENABLE_ONLINE_UPDATE_MAR),\ test_updater_dialog \ @@ -85,6 +84,7 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ cppumaker \ idlc \ javamaker \ + $(call gb_CondExeSp2bv,sp2bv) \ $(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \ $(if $(filter ODK,$(BUILD_TYPE)),unoapploader) \ unoidl-check \ diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk index 5807e3c81f6f..a3a35c6edcc7 100644 --- a/cpputools/Module_cpputools.mk +++ b/cpputools/Module_cpputools.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,cpputools)) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,cpputools,\ - Executable_sp2bv \ + $(call gb_CondExeSp2bv,Executable_sp2bv) \ )) $(eval $(call gb_Module_add_targets,cpputools,\ diff --git a/solenv/gbuild/Conditions.mk b/solenv/gbuild/Conditions.mk index d3f05402b78a..6279f554eb40 100644 --- a/solenv/gbuild/Conditions.mk +++ b/solenv/gbuild/Conditions.mk @@ -19,6 +19,10 @@ define gb_CondBuildRegistryTools $(if $(or $(DISABLE_DYNLOADING),$(ENABLE_MACOSX_SANDBOX)),$(2),$(1)) endef +define gb_CondExeSp2bv +$(if $(and $(filter WNT,$(OS)),$(call gb_Helper_optionals_and,DESKTOP ODK,$(true))),$(1),$(2)) +endef + define gb_CondSalTextEncodingLibrary $(if $(filter ANDROID,$(OS)),,$(if $(DISABLE_DYNLOADING),$(2),$(1))) endef diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index d4d5f1c9eef1..a0441dc3a2a2 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -326,11 +326,9 @@ define gb_Helper_optionals_or $(call gb_Helper_optional,$(1),$(2),$(3)) endef -gb_Helper_optionals_and_token = $(subst $(gb_SPACE),_,gb $(sort $(1))) - # call gb_Helper_optionals_and,build_types,if-true,if-false define gb_Helper_optionals_and -$(if $(filter $(call gb_Helper_optionals_and_token,$(1)),$(call gb_Helper_optionals_and_token,$(filter $(1),$(BUILD_TYPE)))),$(2),$(3)) +$(if $(strip $(filter-out $(filter $(1),$(BUILD_TYPE)),$(1))),$(3),$(2)) endef ifeq ($(WITH_LOCALES),)
