CustomTarget_html.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a72b5e90798aedb8945da175534986791d3d3352
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Feb 25 10:45:31 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Feb 25 10:51:15 2019 +0100
Propagate xsltproc failure, part 2
...following up on c3509fb7e6675a38560c7e2764b21861d1e23362 "Propagate
xsltproc
failure". The while loops would only have a non-zero exit code if the
xsltproc
invocation in the last iteration of the loop fails. (Oddly, adding `set -e`
instead seems to have no effect.)
Change-Id: I9296a59147697595ebe7b0d2b742044f8a8a3f02
Reviewed-on: https://gerrit.libreoffice.org/68309
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index c9ef46cae..38ca62b10 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -46,7 +46,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
rm -f $@.good && \
{ $(call
gb_ExternalExecutable_get_command,xsltproc) $< $$xhp && touch $@.good; } \
| $(gb_AWK) 'NF' \
- && rm $@.good \
+ && rm $@.good || exit \
; done \
&& rm "$$RESPONSEFILE" \
&& echo '};' \
@@ -153,6 +153,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
-o $(dir $@)$${xhp%.xhp}.html \
$(SRCDIR)/helpcontent2/help3xsl/online_transform.xsl \
$(if $(filter WNT,$(OS)),$$(cygpath -m
`pwd`),`pwd`)/$$xhp \
+ || exit \
; done \
&& rm "$$RESPONSEFILE" \
&& touch $@ \
@@ -218,6 +219,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
--stringparam productversion
"$(PRODUCTVERSION)" \
$(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
$$xhp \
+ || exit \
; done && touch $@.good; } \
| sort -k3b -t\> -s \
| awk 'NF' \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
