diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-24 14:12:18 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-22 14:25:51 +0200 |
| commit | 14069d84174ca7a4e60db4d75912903e9679b643 (patch) | |
| tree | adf1a9138c9a1cb942e885d59f1d392a8f9eeb3b /solenv | |
| parent | 75c42c1f3ba6d40d518a4da400a84015d30240c0 (diff) | |
configure: Improve help-options handling
This patch includes:
* A README.help.md as a general documentation for the different
help types, the LO code and help-related build options.
* Adds --disable-xmlhelp for removing the xmlhelp support from the
build. Disable for iOS, Android and Emscripten. This was partly
included in HAVE_FEATURE_DESKTOP before.
* Rename WITH_HELP define to WITH_HELPPACKS, which reflects the
actual usage AFAIK.
* Depend --with-omindex on --with-help=online and don't override
the --with-help setting. Error out on conflicting options.
* Depend --with-helppack-integration on build help variants, which
actually result in help packs.
Kind of reverts commit 2c38ea6d16b910294220cefaf8ae6a0683e6405a
("Building without --with-help is not supposed to disable help
functionality").
Change-Id: Ie4cb73905b3ed94e991d9f1bd75cfbd6de9da385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116222
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 10 |
2 files changed, 19 insertions, 6 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 2aa0fc8d65b2..c7f2404efabd 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -301,8 +301,21 @@ $(1) : $(2) | $(dir $(1)).dir $(call gb_Deliver_add_deliverable,$(1),$(2),$(1)) endef +# call gb_Helper_optional,build_type,if-true,if-false define gb_Helper_optional -$(if $(filter $(1),$(BUILD_TYPE)),$(2)) +$(if $(filter $(1),$(BUILD_TYPE)),$(2),$(3)) +endef + +# call gb_Helper_optionals_or,build_types,if-true,if-false +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)) endef ifeq ($(WITH_LOCALES),) diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index f49dbcc02015..390e391285db 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -33,11 +33,11 @@ gb_BUILD_TOOLS_executables = \ unoidl-check \ unoidl-write \ xrmex \ - $(call gb_Helper_optional_for_host,DESKTOP, \ - HelpIndexer \ - HelpLinker \ - lngconvex \ - ) \ + $(call gb_Helper_optional_for_host,HELPTOOLS, \ + HelpIndexer \ + HelpLinker \ + ) \ + $(if $(filter WNT,$(OS)),$(call gb_Helper_optional_for_host,DESKTOP,lngconvex)) \ gb_BUILD_TOOLS_executables_extern = \ python \ |