diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-05-24 10:41:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-05-24 10:49:58 +0200 |
| commit | 33551e7fd85aa327f76bb343a3740bceb162bbfa (patch) | |
| tree | 40aac82fa9b870aab15a66b38c9ad70bea61b54d /Module_helpcontent2.mk | |
| parent | Fix typo (diff) | |
| download | help-33551e7fd85aa327f76bb343a3740bceb162bbfa.tar.gz help-33551e7fd85aa327f76bb343a3740bceb162bbfa.zip | |
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@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Module_helpcontent2.mk')
| -rw-r--r-- | Module_helpcontent2.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk index 41311cac9c..fa0c0a6d21 100644 --- a/Module_helpcontent2.mk +++ b/Module_helpcontent2.mk @@ -18,14 +18,16 @@ ifeq ($(ENABLE_HTMLHELP),TRUE) $(eval $(call gb_Module_add_targets,helpcontent2,\ CustomTarget_html \ + GeneratedPackage_html_icon-themes \ GeneratedPackage_html_lang_generated \ - GeneratedPackage_html_media \ Package_html_dynamic \ + Package_html_media \ Package_html_static \ )) $(eval $(call gb_Module_add_l10n_targets,helpcontent2,\ AllLangPackage_html_lang \ + AllLangPackage_html_media_lang \ )) endif |