summaryrefslogtreecommitdiff
path: root/helpcontent2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-06-06 09:45:58 +0200
committerGerrit Code Review <gerrit@gerrit.libreoffice.org>2018-06-06 17:31:36 +0200
commit8b3b41e09c642824cd6585d00f10825b62d9b39f (patch)
treece138a5c2ee95fb6beee9e06104f8629dfbbf8ed /helpcontent2
parent07021c995fe1f13fcfd60c9a234b35cb7bf5a838 (diff)
Updated core
Project: help 228048839b6df667fbe9f78bba5a1f7df5835180 (Partially) fix --with-help=html dependencies on .xhp files There are three rules in helpcontent2/CustomTarget_html.mk that process (with XSLT) all or some of the .xhp files in the helpcontent2/source/text/ tree (for en-US; or their translations in the workdir/HelpTranslatePartTarget/*/helpcontent2/source/text/ trees for other languages). Lists of all those .xhp files are defined in helpcontent2/AllLangHelp_*.mk (with gb_AllLangHelp_add_helpfiles), but the code in helpcontent2/CustomTarget_html.mk used `find` to assemble the relevant lists. That has two issues (at least for the en-US case operating on the untranslated helpcontent2/source/text/ files): For one, if the content of those .xhp files changes, the relevant XSLT processing is not re-run. For another, if .xhp files are added to or removed from the lists in helpcontent2/AllLangHelp_*.mk, the relevant XSLT processeing is not re-run, either. For the processing of translated .xhp files, there were already dependencies on those translated files in place. I assume (but have not really proved it) that those dependencies are already sufficient to cover both of the above issues. That only leaves the en-US case, operating on the untranslated files. The lists of .xhp files as defined in helpcontent2/AllLangHelp_*.mk (with "*" ranging over the various "modules": sbasic, scalc, schart, etc.) are now made available in gb_AllLangHelp_*_HELPFILES variables. The contents of those variables is used instead of `find` to pass the relevant .xhp files to the XSLT processings. (Needing some RESPONSEFILE and `xargs -n 1` boilerplate to feed individual files to the XSL processing without overflowing maximum command line lengths. Also, on Windows, var2file apparently writes CRLF line ends but the CR parts need to be filtered out again, and xargs problems must be worked around similar to df9edbcd2883cec2d0596133131cfbc220dee91f "Work around 'xargs: environment is too large for exec' errors on Windows".) However, those variables apparently cannot be used to specify dependencies for the three XSLT-processing rules. Presumably, the variables do not necessarily have their values assigned yet by the time the rules' dependencies are constructed (depending on the order in which .mk files are read?). So "dummy" gb_AllLangHelp_get_helpfiles_target targets are introduced, which depend on all the relevant .xhp files (and which get constructed during gb_AllLangHelp_add_helpfiles, just like the gb_AllLangHelp_*_HELPFILES variables), and which the XSLT-processing rules in turn depend on. That makes sure that the XSLT-processing rules are re-run when the content of .xhp files changes or when new .xhp files are added. However, the above still fails to re-run the XSLT-processing rules when .xhp files are removed. This is the helpcontent2 part of a commit spanning core and helpcontent2. Change-Id: I9a72c0f6837a8e13458a703fdecf7e5b0ef2076f Reviewed-on: https://gerrit.libreoffice.org/55364 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5197a6b9def2e1886e3edab75517864272115089) Reviewed-on: https://gerrit.libreoffice.org/55380
Diffstat (limited to 'helpcontent2')
m---------helpcontent20
1 files changed, 0 insertions, 0 deletions
diff --git a/helpcontent2 b/helpcontent2
-Subproject a21e560274a8c1be3944df93f54612bc02d66f0
+Subproject 228048839b6df667fbe9f78bba5a1f7df583518