Date: prev next · Thread: first prev next last
2020 Archives by date, by thread · List index


So this would be the final nail in the coffin for the traditional HELP ∈ BUILD_TYPE && !ENABLE_HTMLHELP mode. (Though it fails to clean up any newly dead code, of which I assume there is some.)

What is the story for help content brought along by extensions? That has always been an open issue since that new HTML help mode was introduced.

On 18/05/2020 08:08, Tor Lillqvist (via logerrit) wrote:
  configure.ac |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1f6b7678d52e1bf9092e3ce2cf7b7c4ffdcb2ba2
Author:     Tor Lillqvist <tml@collabora.com>
AuthorDate: Wed May 13 18:15:48 2020 +0300
Commit:     Tor Lillqvist <tml@collabora.com>
CommitDate: Mon May 18 08:07:43 2020 +0200

     I am told we don't want to use old style help files any longer
Make --with-help mean the same as --with-help=html to avoid generating
     such unintentionally.
Change-Id: Ie53b3604f53c3301cb196b2239dce6f0c08acbd3
     Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94145
     Tested-by: Jenkins
     Reviewed-by: Tor Lillqvist <tml@collabora.com>

diff --git a/configure.ac b/configure.ac
index 1d531f32edec..171dd945a241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2021,7 +2021,7 @@ AC_ARG_WITH(help,
           can be used to bundle only the common part, .e.g help-specific icons.
           This is useful when you build the helpcontent separately.])
      [
-                          Usage:     --with-help    build the old local help
+                          Usage: --with-help        build the new HTML local help
                                   --without-help     no local help (default)
                                   --with-help=html   build the new HTML local help
                                   --with-help=online build the new HTML online help
@@ -5049,8 +5049,9 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != 
Androi
          AC_MSG_RESULT([HTML])
          ;;
      yes)
+        ENABLE_HTMLHELP=TRUE
          SCPDEFS="$SCPDEFS -DWITH_HELP"
-        AC_MSG_RESULT([yes])
+        AC_MSG_RESULT([HTML])
          ;;
      *)
          AC_MSG_ERROR([Unknown --with-help=$with_help])


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.