git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Johnsen <chris_johnsen@pobox.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Chris Johnsen <chris_johnsen@pobox.com>
Subject: [PATCH 2/2] Documentation/Makefile: break up texi pipeline
Date: Tue, 24 Mar 2009 23:21:40 -0500	[thread overview]
Message-ID: <1237954900-21161-2-git-send-email-chris_johnsen@pobox.com> (raw)
In-Reply-To: <1237954900-21161-1-git-send-email-chris_johnsen@pobox.com>

Most shells define the exit value of a pipeline as the exit value
of the last process. For each texi rule, run the DOCBOOK2X_TEXI
tool and the "fixup" script in their own non-pipeline commands so
that make will notice an error exit code.

Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>

---

This textually depends on my "quiet doc gen" patch as it modifies
a couple of the same lines.
---
 Documentation/Makefile |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3f9bc01..372a2cc 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -177,7 +177,7 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
 
 clean:
 	$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
-	$(RM) *.texi *.texi+ git.info gitman.info
+	$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
 	$(RM) howto-index.txt howto/*.html doc.dep
 	$(RM) technical/api-*.html technical/api-index.txt
 	$(RM) $(cmds_txt) *.made
@@ -220,8 +220,9 @@ git.info: user-manual.texi
 
 user-manual.texi: user-manual.xml
 	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
-	$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \
-		$(PERL_PATH) fix-texi.perl >$@+ && \
+	$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
+	$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
+	rm $@++ && \
 	mv $@+ $@
 
 user-manual.pdf: user-manual.xml
@@ -232,7 +233,9 @@ user-manual.pdf: user-manual.xml
 gitman.texi: $(MAN_XML) cat-texi.perl
 	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
 	($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
-		--to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+ && \
+		--to-stdout $(xml) &&) true) > $@++
+	$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
+	rm $@++ && \
 	mv $@+ $@
 
 gitman.info: gitman.texi
-- 
1.6.2.1.315.g33192

  reply	other threads:[~2009-03-25  4:24 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-24  8:04 [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals Chris Johnsen
2009-03-24  8:04 ` [PATCH 1/8] Documentation: move callouts.xsl to manpage-{base,normal}.xsl Chris Johnsen
2009-03-24  8:51   ` Jeff King
2009-03-24 19:36     ` Chris Johnsen
2009-03-26  9:40       ` Jeff King
2009-03-24  8:04 ` [PATCH 2/8] Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl Chris Johnsen
2009-03-24  8:57   ` Jeff King
2009-03-24 19:42     ` Chris Johnsen
2009-03-24  8:04 ` [PATCH 3/8] Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff Chris Johnsen
2009-03-24  9:04   ` Jeff King
2009-03-24 19:48     ` Chris Johnsen
2009-03-26  9:43       ` Jeff King
2009-03-26 16:47         ` Junio C Hamano
2009-03-26 18:49           ` Michael J Gruber
2009-03-24  8:04 ` [PATCH 4/8] Documentation: move quieting params into manpage-base.xsl Chris Johnsen
2009-03-24  9:18   ` Jeff King
2009-03-25  4:21     ` [PATCH 1/2] Documentation/Makefile: make most operations "quiet" Chris Johnsen
2009-03-25  4:21       ` Chris Johnsen [this message]
2009-03-25  4:28       ` Jeff King
2009-03-25  9:55         ` Chris Johnsen
2009-03-24  8:04 ` [PATCH 5/8] Documentation: move "spurious .sp" code into manpage-base.xsl Chris Johnsen
2009-03-24  8:04 ` [PATCH 6/8] Documentation: asciidoc.conf: always use <literallayout> for [blocktext] Chris Johnsen
2009-03-24  8:04 ` [PATCH 7/8] Documentation: asciidoc.conf: fix verse block with block titles Chris Johnsen
2009-03-24  8:04 ` [PATCH 8/8] Documentation: option to render literal text as bold for manpages Chris Johnsen
2009-03-26  8:59 ` [PATCH 0/8] Documentation: XSLT/asciidoc.conf cleanup; tty literals Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1237954900-21161-2-git-send-email-chris_johnsen@pobox.com \
    --to=chris_johnsen@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).