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 /scp2 | |
| 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 'scp2')
| -rw-r--r-- | scp2/source/base/file_base.scp | 2 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 2 | ||||
| -rw-r--r-- | scp2/source/draw/file_draw.scp | 2 | ||||
| -rw-r--r-- | scp2/source/impress/file_impress.scp | 2 | ||||
| -rw-r--r-- | scp2/source/math/file_math.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/writer/file_writer.scp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 5c50dd3b7af7..e2a8d364bb57 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Sdatabase_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 75cbbbc119b9..84ffb5bfe32a 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Calc_Xcd Name = "calc.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Scalc_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp index 49d6d5dd40dc..93ca07b07af5 100644 --- a/scp2/source/draw/file_draw.scp +++ b/scp2/source/draw/file_draw.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Draw_Xcd Name = "draw.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Sdraw_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index f689c62f7b5f..bed62eede8ad 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Impress_Xcd Name = "impress.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Simpress_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 12877b8f1eda..790873958261 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Math_Xcd Name = "math.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Smath_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9bdeab03e702..9a49f163adaa 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -27,7 +27,7 @@ #include "macros.inc" -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Common_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 28966fc7b696..d29e1594a48c 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Swriter_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; |