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 /Repository.mk | |
| 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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 218a4417f96e..9d3ef1bcc1e3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -18,8 +18,10 @@ # $(eval $(call gb_Helper_register_executables,NONE, \ + $(call gb_Helper_optional,HELPTOOLS, \ HelpIndexer \ HelpLinker \ + ) \ bestreversemap \ canvasdemo \ cfgex \ @@ -368,7 +370,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ fwk \ $(if $(filter WNT,$(OS)),gdipluscanvas) \ guesslang \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ + $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,helplinker) \ i18npool \ i18nsearch \ hyphen \ @@ -622,7 +624,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(WITH_WEBDAV),ucpdav1) \ ucpfile1 \ ucpftp1 \ - ucpchelp1 \ + $(call gb_Helper_optional,XMLHELP,ucpchelp1) \ ucphier1 \ ucppkg1 \ unopkgapp \ @@ -914,7 +916,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(filter $(OS),MACOSX),vcl_osxres) \ xmloff_dtd \ xmlscript_dtd \ - xmlhelp_helpxsl \ + $(call gb_Helper_optional,XMLHELP,xmlhelp_helpxsl) \ $(if $(ENABLE_JAVA),\ scripting_java \ scripting_java_jars \ |