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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/qa/uitest/writer_tests3/hyperlinkdialog.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py index 5fd946afab0f..be48fa6a750d 100644 --- a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py +++ b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py @@ -87,12 +87,12 @@ class HyperlinkDialog(UITestCase): # opened in the user's default browser): if os.getenv('ENABLE_HTMLHELP') == 'TRUE': return - # Skip this test for --with-help, as that would fail with a + # Skip this test for --enable-xmlhelp, as that would fail with a # "uno.com.sun.star.uno.RuntimeException: Could not find child with id: cancel" thrown from # the below execute_blocking_action call, as it would open the "LibreOffice Help" window # instead of the apparently expected "LibreOffice Help Not Installed" dialog that has a # "Cancel" button: - if re.compile(r'-DWITH_HELP\b').search(os.getenv('SCPDEFS')): + if re.compile(r'XMLHELP\b').search(os.getenv('BUILD_TYPE')): return self.ui_test.create_doc_in_start_center("writer") |