[Libreoffice-commits] core.git: 2 commits - helpcontent2 solenv/gbuild

2022-12-14 Thread Stephan Bergmann (via logerrit) 
 helpcontent2|2 +-
 solenv/gbuild/ExternalExecutable.mk |6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c9de64e92cac1f4b9907399d7f51f70021f7e39c
Author: Stephan Bergmann 
AuthorDate: Wed Dec 14 11:42:16 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Dec 14 10:42:16 2022 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 970907045a2400da7ed6e3d14ef76f7ad3b2d783
  - Fix prepending xargs to gb_ExternalExecutable_get_command, help part

...as was done in f048f02f505704a76c4f01b4ff3f369e8ed928b5 "hid2file.js
generation: process in batch, not each file one-by-one", causing my 
build to
fail with

> [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js
> xargs: 
LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program:
 No such file or directory

Change-Id: I94ea42878de55a887e6955b350997425438bb90e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index e3b1cce7dde7..970907045a24 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e3b1cce7dde7e964c7670dd24a167e750654685a
+Subproject commit 970907045a2400da7ed6e3d14ef76f7ad3b2d783
commit 3d117dcc4a705f477c8223978200756ac9f83fe3
Author: Stephan Bergmann 
AuthorDate: Wed Dec 14 09:42:04 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 14 10:42:00 2022 +

Fix prepending xargs to gb_ExternalExecutable_get_command, core part

...as was done in


"hid2file.js generation: process in batch, not each file one-by-one", 
causing my
build to fail with

> [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js
> xargs: 
LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program:
 No such file or directory

Change-Id: I5a58874aa746de13cfc86b691c11349196092dce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144151
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/gbuild/ExternalExecutable.mk 
b/solenv/gbuild/ExternalExecutable.mk
index 7a0fd996dd53..0982dd9b8e7f 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -185,6 +185,7 @@ endef
 define gb_ExternalExecutable__get_command
 $(call gb_ExternalExecutale__check_registration,$(1))
 $(gb_ExternalExecutable_$(1)_PRECOMMAND) \
+   $(2) \
$(call gb_ExternalExecutable__get_internal,$(1)) \
$(call gb_ExternalExecutable__get_executable,$(1)) \
$(gb_ExternalExecutable_$(1)_ARGUMENTS)
@@ -196,9 +197,12 @@ endef
 # LD_LIBRARY_PATH for internally built executables), and icerun wrapper
 # for limiting the maximum number of processes, if available.
 #
+# $2 is an optional part (like "xargs") to place between the setting of shell 
variables and the
+# command proper.
+#
 # gb_ExternalExecutable_get_command executable
 define gb_ExternalExecutable_get_command
-$(strip $(call gb_ExternalExecutable__get_command,$(1)))
+$(strip $(call gb_ExternalExecutable__get_command,$(1),$(2)))
 endef
 
 define gb_ExternalExecutable__get_dependencies

[Libreoffice-commits] core.git: 2 commits - helpcontent2 solenv/gbuild

2018-06-06 Thread Stephan Bergmann 
 helpcontent2 |2 +-
 solenv/gbuild/AllLangHelp.mk |   11 ++-
 solenv/gbuild/TargetLocations.mk |1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit e5ad0150dc543ccbf3631ea57ad0919b3faa599b
Author: Stephan Bergmann 
Date:   Wed Jun 6 09:45:58 2018 +0200

Updated core
Project: help  5197a6b9def2e1886e3edab75517864272115089

(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 
Reviewed-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index 3765355e41d0..5197a6b9def2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3765355e41d02ee3e5f64ef6ece336641553e7c7
+Subproject commit 5197a6b9def2e1886e3edab75517864272115089
commit ec8edaa3e0b42158f17e540895d5422f91a99fbe
Author: Stephan Bergmann 
Date:   Wed Jun 6 09:45:14 2018 +0200

(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