summaryrefslogtreecommitdiffstats
path: root/Module_helpcontent2.mk
Commit message (Collapse)AuthorAgeFilesLines
* Properly handle language-specific parts of --with-help=html media/ sub-treeStephan Bergmann2018-05-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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>
* An AllLangPackage should be an l10n_targetStephan Bergmann2018-05-031-1/+6
| | | | | | | | | | | ...to avoid "target ... should be a l10n target" warnings from solenv/gbuild/Module.mk (but apart from that, doesn't seem to make much of a difference) Change-Id: I193333b1f9fba63795d6e99ca97de8d07eb744e6 Reviewed-on: https://gerrit.libreoffice.org/53794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* tdf#116240: Include --with-help=html in installation setsStephan Bergmann2018-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | ...by extending the hackery in helpcontent2/CustomTarget_html.mk (see comment there). (Ultimately, the gbuild HelpTarget machinery should probably be adapted to the needs of this new help format, once the old help format is no longer supported?) The Perl packaging code finds source files through the "include" paths specified in instsetoo_native/util/openoffice.lst.in. To avoid potential name clashes, put the new .filelist files into workdir/CustomTarget/helpcontent2/help3xsl/filelists/html-help/ sub-directories. read_filelist in solenv/bin/modules/installer/filelists.pm does not strip white space following the last item in a file list, but (with HAVE_GNUMAKE_FILE_FUNC) the gb_HelpTarget_get_translation_target .filelist files (which are then transformed with sed into the .html .filelist files read by the Perl packaging code) may contain such trailing white space. So $(strip ...) their content in solenv/gbuild/HelpTarget.mk. This is the helpcontent2 part of a change spanning core and helpcontent2. Change-Id: I730caaaec783d0a0a9c79caf85268a775220dee3 Reviewed-on: https://gerrit.libreoffice.org/53724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* WIP: Split --with-help=html packages into non-locale and per-localeStephan Bergmann2018-04-231-2/+3
| | | | | | | | | | | | | | | | | | ...in preparation of packaging the per-locale data properly. non-locale: GeneratedPackage_html_media Package_html_dynamic Package_html_static per-locale: GeneratedPackage_html_lang_generated Package_html_lang This is the helpcontent2 part of a change that spans core and helpcontent2. Change-Id: Iabe24a710d46d23246699d102ab96686cfe85ab4 Reviewed-on: https://gerrit.libreoffice.org/53317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Avoid name clash between Package and GeneratedPackage htmlcontent2_htmlStephan Bergmann2018-04-201-1/+1
| | | | | | | | | | | | | | ...by renaming the latter to htmlcontent2_html_generated. The name clash happened to not cause trouble yet, but would once these packages are added to installation sets (i.e., once both would want to occur in gb_Helper_register_packages_for_install lists in Repository.mk). (Also do some minor syntactic clean up.) Change-Id: I009c154d3bb06312a9f4224b2d5feb1d9f6689fc Reviewed-on: https://gerrit.libreoffice.org/53208 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* move generation of HTML help to gbuildDavid Tardon2017-12-071-0/+10
| | | | Change-Id: Ic38ee7b9a3ee4a45bede9d494f717d833e53d69f
* helpcontent2: rename postprocess_helpimages to helpcontent2_helpimagesMichael Stahl2017-06-011-1/+1
| | | | Change-Id: Ie8cc9e4cca21201b16bf0b1aae185d692cf0c214
* Move processing of help-specific images to helpcontentKatarina Behrens2017-05-121-0/+1
| | | | | | | Change-Id: I4370c7ab41184a59bb92e8df49f2fe3ca84c9c8c Reviewed-on: https://gerrit.libreoffice.org/30958 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tweak help for core Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863Bjoern Michaelsen2013-11-141-1/+4
| | | | | | | Change-Id: Iffb5f9facb234be10523af93f1e23607fb4fdd1c Reviewed-on: https://gerrit.libreoffice.org/6663 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
* helpcontent: no need to deliver helpimg.ilstMichael Stahl2013-10-241-1/+0
| | | | | | ... since postprocess reads it from WORKDIR already. Change-Id: Ib65a45b5afec3884f890850b5d95c1ef828e0ca3
* help.hid is not used for install--don't deliverDavid Tardon2013-05-051-1/+0
| | | | Change-Id: I690d20dac7180d8f8de31148cf88cb7e07778db4
* gbuildize helpcontent2David Tardon2013-02-261-0/+27
dmake is dead, long live gbuild! Change-Id: I636ea4ed7ee08a748b96973ae076a5e47928d4ca
generated by cgit (git 2.34.1) at 2024-05-05 19:20:45 +0000