[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

 helpcontent2 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9146dc8850494e564ccf725bcd1861ccb7ce2f65
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 24 10:41:34 2018 +0200

    Updated core
    Project: help  33551e7fd85aa327f76bb343a3740bceb162bbfa
    
    Properly handle language-specific parts of --with-help=html media/ sub-tree
    
    ...that previously ended up in language-independent parts of installation sets.
    
    The structure of that media/ tree doesn't allow to directly mis-use the existing
    AllLangPackage machinery (which expects the language to be encoded in the first
    pathname segment within the tree; and which is already mis-used for the
    helpcontent2/AllLangPackage_html_lang.mk parts).
    
    So introduce gb_AllLangPackage_add_files_for_lang that allows to specify the
    language explicitly, independent of where it is encoded in the pathname (if at
    all).  The underlying gb_AllLangPackage_add_file sets a
    gb_AllLangPackage_ALLDIRS that is used by `make packageinfo`, which may need
    further fixing by anybody actually using that target; see the mail thread
    starting at
    <https://lists.freedesktop.org/archives/libreoffice/2018-May/080242.html>
    "Broken --with-help=html `make packageinfo`".
    
    All files in $(SRCDIR)/helpcontent2/source/media/ must now explicitly be listed
    in either helpcontent2/Package_html_media.mk (for the language-independent
    files) or helpcontent2/AllLangPackage_html_media_lang.mk (for the language-
    specific files).  Also note the two TODOs in
    helpcontent2/AllLangPackage_html_media_lang.mk.
    
    What is not quite right yet is that content from
    helpcontent2/AllLangPackage_html_lang.mk and
    helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both per-language
    helpcontent installation sets (as intended, via the instructions in
    helpcontent2/CustomTarget_html.mk) and per-language languagepack installation
    sets (which is unintended).  This needs to be fixed with a follow-up commit.
    
    This is the helpcontent2 part of a commit spanning core and helpcontent2.
    
    Change-Id: Ie7916b75eee0dde3106e784d19e99fde5bb93195
    Reviewed-on: https://gerrit.libreoffice.org/54749
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index ac3b3c4e5f94..33551e7fd85a 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ac3b3c4e5f94f4f942121833d08bcffd847a291c
+Subproject commit 33551e7fd85aa327f76bb343a3740bceb162bbfa