ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sp2bv is just used by the ODK on Windows

Browse Source 
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 <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2022-01-08 12:04:09 +01:00
parent 35aa82ef1c
commit 692838e958
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+1 -1
View File
@@ -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 \
cpputools/Module_cpputools.mk
+1 -1
View File
@@ -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,\
solenv/gbuild/Conditions.mk
+4
View File
@@ -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
solenv/gbuild/Helper.mk
+1 -3
View File
@@ -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),)