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>

1 files changed, 250 insertions, 0 deletions

diff --git a/AllLangPackage_html_media_lang.mk b/AllLangPackage_html_media_lang.mk
new file mode 100644
index 0000000000..45e983a430
--- /dev/null
+++ b/AllLangPackage_html_media_lang.mk
@@ -0,0 +1,250 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Language-specific parts of the help/media/ sub-tree.  All language-specific content from
+# $(SRCDIR)/helpcontent2/source/media/ must be listed here.  Content that is present in $(SRCDIR)
+# for all languages in some set of languages can be handled with a foreach (like the screenshots
+# present for all languages in $(completelangiso) below).  More irregular conent that is present in
+# $(SRCDIR) only for some languages is handled with the individual per-language blocks.
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_media_lang,$(SRCDIR)/helpcontent2/source/media))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,bg,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/bg/feldalle.png \
+    helpimg/bg/feldbrei.png \
+    helpimg/bg/feldcolo.png \
+    helpimg/bg/names_as_addressing.png \
+    helpimg/bg/sheettabs.png \
+    helpimg/bg/swh00117.png \
+    helpimg/bg/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,cs,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/cs/feldalle.png \
+    helpimg/cs/feldbrei.png \
+    helpimg/cs/feldcolo.png \
+    helpimg/cs/names_as_addressing.png \
+    helpimg/cs/sheettabs.png \
+    helpimg/cs/swh00117.png \
+    helpimg/cs/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,da,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/da/feldalle.png \
+    helpimg/da/feldbrei.png \
+    helpimg/da/feldcolo.png \
+    helpimg/da/names_as_addressing.png \
+    helpimg/da/sheettabs.png \
+    helpimg/da/swh00117.png \
+    helpimg/da/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,de,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/de/feldalle.png \
+    helpimg/de/feldcolo.png \
+    helpimg/de/names_as_addressing.png \
+    helpimg/de/sheettabs.png \
+    helpimg/de/swh00117.png \
+    helpimg/de/zellvor.png \
+))
+
+#TODO: Content for en-US is probably an error here; it should likely be part of the language-
+# independent helpcontent2/Package_html_media.mk instead:
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,en-US,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    screenshots/modules/swriter/ui/exportepub/en-US/EPubDialog.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,es,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/es/feldalle.png \
+    helpimg/es/feldcolo.png \
+    helpimg/es/names_as_addressing.png \
+    helpimg/es/sheettabs.png \
+    helpimg/es/swh00117.png \
+    helpimg/es/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,et,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/et/feldalle.png \
+    helpimg/et/feldbrei.png \
+    helpimg/et/feldcolo.png \
+    helpimg/et/names_as_addressing.png \
+    helpimg/et/sheettabs.png \
+    helpimg/et/swh00117.png \
+    helpimg/et/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,fr,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    files/scalc/fr/pivot.ods \
+    helpimg/fr/feldalle.png \
+    helpimg/fr/feldbrei.png \
+    helpimg/fr/feldcolo.png \
+    helpimg/fr/names_as_addressing.png \
+    helpimg/fr/sheettabs.png \
+    helpimg/fr/swh00117.png \
+    helpimg/fr/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,hu,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/hu/feldalle.png \
+    helpimg/hu/feldbrei.png \
+    helpimg/hu/feldcolo.png \
+    helpimg/hu/names_as_addressing.png \
+    helpimg/hu/sheettabs.png \
+    helpimg/hu/swh00117.png \
+    helpimg/hu/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,it,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/it/feldalle.png \
+    helpimg/it/feldbrei.png \
+    helpimg/it/feldcolo.png \
+    helpimg/it/names_as_addressing.png \
+    helpimg/it/sheettabs.png \
+    helpimg/it/swh00117.png \
+    helpimg/it/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,ja,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/ja/feldalle.png \
+    helpimg/ja/feldbrei.png \
+    helpimg/ja/feldcolo.png \
+    helpimg/ja/names_as_addressing.png \
+    helpimg/ja/sheettabs.png \
+    helpimg/ja/swh00055.png \
+    helpimg/ja/swh00117.png \
+    helpimg/ja/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,km,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/km/feldcolo.png \
+    helpimg/km/names_as_addressing.png \
+    helpimg/km/sheettabs.png \
+    helpimg/km/swh00117.png \
+    helpimg/km/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,ko,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/ko/feldalle.png \
+    helpimg/ko/feldbrei.png \
+    helpimg/ko/feldcolo.png \
+    helpimg/ko/names_as_addressing.png \
+    helpimg/ko/sheettabs.png \
+    helpimg/ko/swh00055.png \
+    helpimg/ko/swh00117.png \
+    helpimg/ko/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pl,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/pl/feldalle.png \
+    helpimg/pl/feldbrei.png \
+    helpimg/pl/feldcolo.png \
+    helpimg/pl/names_as_addressing.png \
+    helpimg/pl/sheettabs.png \
+    helpimg/pl/swh00117.png \
+    helpimg/pl/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pt,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/pt/feldalle.png \
+    helpimg/pt/feldbrei.png \
+    helpimg/pt/feldcolo.png \
+    helpimg/pt/names_as_addressing.png \
+    helpimg/pt/sheettabs.png \
+    helpimg/pt/swh00117.png \
+    helpimg/pt/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pt-BR,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    files/scalc/pt-BR/pivot.ods \
+    helpimg/pt-BR/feldalle.png \
+    helpimg/pt-BR/feldbrei.png \
+    helpimg/pt-BR/feldcolo.png \
+    helpimg/pt-BR/names_as_addressing.png \
+    helpimg/pt-BR/sheettabs.png \
+    helpimg/pt-BR/swh00117.png \
+    helpimg/pt-BR/zellvor.png \
+    screenshots/modules/swriter/ui/exportepub/pt-BR/EPubDialog.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,sk,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/sk/feldalle.png \
+    helpimg/sk/feldbrei.png \
+    helpimg/sk/feldcolo.png \
+    helpimg/sk/names_as_addressing.png \
+    helpimg/sk/sheettabs.png \
+    helpimg/sk/swh00117.png \
+    helpimg/sk/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,sl,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/sl/feldalle.png \
+    helpimg/sl/feldbrei.png \
+    helpimg/sl/feldcolo.png \
+    helpimg/sl/names_as_addressing.png \
+    helpimg/sl/sheettabs.png \
+    helpimg/sl/swh00117.png \
+    helpimg/sl/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,sv,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/sv/feldalle.png \
+    helpimg/sv/feldbrei.png \
+    helpimg/sv/feldcolo.png \
+    helpimg/sv/names_as_addressing.png \
+    helpimg/sv/sheettabs.png \
+    helpimg/sv/swh00117.png \
+    helpimg/sv/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,tr,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/tr/feldalle.png \
+    helpimg/tr/feldbrei.png \
+    helpimg/tr/feldcolo.png \
+    helpimg/tr/names_as_addressing.png \
+    helpimg/tr/sheettabs.png \
+    helpimg/tr/swh00117.png \
+    helpimg/tr/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,zh-CN,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/zh-CN/feldalle.png \
+    helpimg/zh-CN/feldbrei.png \
+    helpimg/zh-CN/feldcolo.png \
+    helpimg/zh-CN/names_as_addressing.png \
+    helpimg/zh-CN/sheettabs.png \
+    helpimg/zh-CN/swh00055.png \
+    helpimg/zh-CN/swh00117.png \
+    helpimg/zh-CN/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,zh-TW,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/zh-TW/feldalle.png \
+    helpimg/zh-TW/feldbrei.png \
+    helpimg/zh-TW/feldcolo.png \
+    helpimg/zh-TW/names_as_addressing.png \
+    helpimg/zh-TW/sheettabs.png \
+    helpimg/zh-TW/swh00055.png \
+    helpimg/zh-TW/swh00117.png \
+    helpimg/zh-TW/zellvor.png \
+))
+
+#TODO: fy is filtered out for now, as $(SRCDIR)/helpcontent2/source/media/ doesn't contain the
+# corresponding screenshots yet:
+$(foreach lang,$(filter-out en-US fy,$(completelangiso)),$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,$(lang),$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    screenshots/modules/smath/ui/alignmentdialog/$(lang)/AlignmentDialog.png \
+    screenshots/modules/smath/ui/catalogdialog/$(lang)/CatalogDialog.png \
+    screenshots/modules/smath/ui/fontdialog/$(lang)/FontDialog.png \
+    screenshots/modules/smath/ui/fontsizedialog/$(lang)/FontSizeDialog.png \
+    screenshots/modules/smath/ui/fonttypedialog/$(lang)/FontsDialog.png \
+    screenshots/modules/smath/ui/savedefaultsdialog/$(lang)/SaveDefaultsDialog.png \
+    screenshots/modules/smath/ui/spacingdialog/$(lang)/SpacingDialog.png \
+    screenshots/modules/smath/ui/symdefinedialog/$(lang)/EditSymbols.png \
+)))
+
+# vim: set noet sw=4 ts=4: