Age | Commit message (Collapse) | Author |
|
as mac's make might pick the one without the dependency on the direcotry
when trying to "make" that <module>.helpfiles target
Change-Id: I60a55be118bc9a41352dad94326247b02aef1dd6
Reviewed-on: https://gerrit.libreoffice.org/56960
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Change-Id: Icaf0f54d3487c8286486d265ebb9790f6b9e0910
Reviewed-on: https://gerrit.libreoffice.org/55419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
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 core part of a commit spanning core and helpcontent2.
Change-Id: I0cb5f83097db17fbd7ae8b528418b0ec24bee602
Reviewed-on: https://gerrit.libreoffice.org/55363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: I7c5f2dadcbbe543a774f5fbdd52babd25b8b17d1
Reviewed-on: https://gerrit.libreoffice.org/55319
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: I4debf079be228e5ce5fae5f1a153f78800407a59
|
|
Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8
Reviewed-on: https://gerrit.libreoffice.org/6754
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
It does not make sense to repeat the same check many times.
Change-Id: I71fac6a4e8283d293a6bd50637ff3a1e6c2ad40d
|
|
Change-Id: I2dfaa895a3efefa6fee8d21575f148ef9bba03c3
|
|
Change-Id: I8bdcc273b50e35dbbb0e34183a465e370cc5b22c
|
|
Change-Id: Idea360fdd78f21f5f42500da938340bb1870f29f
|
|
Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
Reviewed-on: https://gerrit.libreoffice.org/3384
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
This is preparation for delivering HelpTarget files as a Package, which
would not be possible with the previous impl.
Change-Id: Ia79effcb77aaa7054987879c394cb277e377c9d8
Reviewed-on: https://gerrit.libreoffice.org/3383
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I78192d10c4b337631091aed5ffee9f2973f06964
|
|
Change-Id: I964b5698f1e17c5f923220e6a8567aad697780b2
|
|
Change-Id: Ibcde46381cac50058f93e26f0eceb9b1446d1702
|
|
Change-Id: I9a6847caa8e8432f500b37e89076594c3728fe2b
|
|
Change-Id: I83f9b99abcc952dfea924662a0db8d98efc56307
|
|
Change-Id: If1cdcb35be2c2eeb1a3d80ddd7b751e0168982d4
|
|
Change-Id: Id481219cae8af1cea90dbc0f1d28f6a6483927d8
|
|
Change-Id: I1cc5600ab0f6236c451d07bfb5ad9ee42ea4754a
|