diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-24 14:12:18 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-24 17:47:49 +0200 |
| commit | 576a49d0276b1b5bf058cd1e17d3a9df6effb68a (patch) | |
| tree | d0972d558234d1804addc3adf4b30409bc142382 /desktop/source/deployment | |
| parent | configure: Replace tabs with spaces (diff) | |
| download | core-576a49d0276b1b5bf058cd1e17d3a9df6effb68a.tar.gz core-576a49d0276b1b5bf058cd1e17d3a9df6effb68a.zip | |
configure: Improve help handling
To summerize my understanding of the help build:
LO can build three kinds of help: XML (local), HTML (local) and
HTML-online. Both local help variants can be included in help-
packs, which might be bundeled with the installer or provided as
separate packages. The HTML-online help is the external help
provided by help.libreoffice.org, which can provide an additional,
xapian-omega based, search mechanism. The XML help is build with
additional index and formating using internal tools. The xmlhelp
module is used to display the XML help. Both HTML-based help is
shown in a browser.
What this patch includes is:
* Adds --enable-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 a 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
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/registry/help/dp_help.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index b1367a335fa2..542efff7269d 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -18,7 +18,7 @@ */ #include <memory> -#include <config_feature_desktop.h> +#include <config_features.h> #include <strings.hrc> #include <dp_backend.h> @@ -31,7 +31,7 @@ #include <unotools/pathoptions.hxx> #include <cppuhelper/supportsservice.hxx> -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_XMLHELP #include <helpcompiler/compilehelp.hxx> #include <helpcompiler/HelpIndexer.hxx> #endif @@ -378,7 +378,7 @@ void BackendImpl::implProcessHelp( data.dataUrl = xPackage->getURL(); if (!package->extensionContainsCompiledHelp()) { -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_XMLHELP const OUString sHelpFolder = createFolder(xCmdEnv); data.dataUrl = sHelpFolder; |