CustomTarget_html.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 422240e98d01fab6d4f98bf1aeec3de67f0128c7
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Dec 22 14:21:49 2022 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Dec 22 13:35:14 2022 +0000
make html.text target make more robust on windows re CR at EOL
some cygwin setups still treat the final CR as part of the filename, so
avoid that problem alltogether by simply appending a dummy entry to each
line on the responsefile to catch any stray EOL/EOF characters
Change-Id: I624eeeca033f72b2845394b44f27b6e32d01eb70
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144758
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 9871dc3b0f8eb24793fc797d478db534d92ec5d7)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144722
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 9a885b46af..0e955e5231 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -210,8 +210,8 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
rm -rf $(dir $@)text && mkdir -p $(dir $@)text && cd $(dir $@)text &&
mkdir -p $(sort $(subst helpcontent2/source/text/,,$(dir
$(gb_html_allhelpfiles)))) \
&& cd $(if $(filter en-US,$*),$(SRCDIR),$(call
gb_HelpTranslatePartTarget_get_workdir,$*)) \
- && RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix
$(NEWLINE),$(subst helpcontent2/source/,,$(gb_html_allhelpfiles)))) \
- && while read xhp; do \
+ && RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix
$(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(subst
helpcontent2/source/,,$(gb_html_allhelpfiles)))) \
+ && while read xhp dummy; do \
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam Language $* \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
