From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
"Martin Ågren" <martin.agren@gmail.com>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v3 0/5] doc: asciidoc cleanups
Date: Fri, 21 May 2021 17:29:36 -0500 [thread overview]
Message-ID: <20210521222941.525901-1-felipe.contreras@gmail.com> (raw)
This patch series is an attempt to cleanup the Makefile of the documentation.
Since v2 only certain $(RM) commands are moved from one patch to another.
Felipe Contreras (5):
doc: refactor common asciidoc dependencies
doc: improve asciidoc dependencies
doc: remove unnecessary rm instances
doc: simplify Makefile using .DELETE_ON_ERROR
doc: avoid using rm directly
Documentation/Makefile | 77 ++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 48 deletions(-)
Range-diff against v2:
1: 55b188c8ad = 1: cbcaefed3e doc: refactor common asciidoc dependencies
2: e69d0a5b89 = 2: 1c8b0b9123 doc: improve asciidoc dependencies
3: 4f18675ce9 < -: ---------- doc: remove unnecessary rm instances
-: ---------- > 3: 3da461a55d doc: remove unnecessary rm instances
4: 935675e070 ! 4: a8c4c4ae26 doc: simplify Makefile using .DELETE_ON_ERROR
@@ Documentation/Makefile: docdep_prereqs = \
cmd-list.made $(cmds_txt)
doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl
-- $(QUIET_GEN)$(RM) $@+ $@ && \
-- $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
+- $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
- mv $@+ $@
+ $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@ $(QUIET_STDERR)
@@ Documentation/Makefile: clean:
$(RM) GIT-ASCIIDOCFLAGS
$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
-- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- $(TXT_TO_HTML) -d manpage -o $@+ $< && \
+- $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@+ $< && \
- mv $@+ $@
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
-- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- $(TXT_TO_HTML) -o $@+ $< && \
+- $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@+ $< && \
- mv $@+ $@
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
@@ Documentation/Makefile: manpage-base-url.xsl: manpage-base-url.xsl.in
$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
%.xml : %.txt $(ASCIIDOC_DEPS)
-- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- $(TXT_TO_XML) -d manpage -o $@+ $< && \
+- $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@+ $< && \
- mv $@+ $@
+ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
-- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- $(TXT_TO_XML) -d book -o $@+ $< && \
+- $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@+ $< && \
- mv $@+ $@
+ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<
@@ Documentation/Makefile: XSLTOPTS += --stringparam html.stylesheet docbook-xsl.cs
XSLTOPTS += --param generate.consistent.ids 1
user-manual.html: user-manual.xml $(XSLT)
-- $(QUIET_XSLTPROC)$(RM) $@+ $@ && \
-- xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
+- $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
- mv $@+ $@
+ $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
@@ Documentation/Makefile: XSLTOPTS += --stringparam html.stylesheet docbook-xsl.cs
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
user-manual.texi: user-manual.xml
-- $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
-- $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
+- $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
- $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
- rm $@++ && \
- mv $@+ $@
@@ Documentation/Makefile: XSLTOPTS += --stringparam html.stylesheet docbook-xsl.cs
+ rm $@+
user-manual.pdf: user-manual.xml
-- $(QUIET_DBLATEX)$(RM) $@+ $@ && \
-- $(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
+- $(QUIET_DBLATEX)$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
- mv $@+ $@
+ $(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $<
gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
-- $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
-+ $(QUIET_DB2TEXI) \
+ $(QUIET_DB2TEXI) \
($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \
$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \
- rm $(xml)+ &&) true) > $@++ && \
@@ Documentation/Makefile: XSLTOPTS += --stringparam html.stylesheet docbook-xsl.cs
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
-- $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
-- $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
+- $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
- mv $@+ $@
+ $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@
howto-index.txt: howto-index.sh $(HOWTO_TXT)
-- $(QUIET_GEN)$(RM) $@+ $@ && \
-- '$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \
+- $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \
- mv $@+ $@
+ $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
-@@ Documentation/Makefile: WEBDOC_DEST = /pub/software/scm/git/docs
-
- howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
+@@ Documentation/Makefile: howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
-- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-+ $(QUIET_ASCIIDOC) \
+ $(QUIET_ASCIIDOC) \
sed -e '1,/^$$/d' $< | \
- $(TXT_TO_HTML) - >$@+ && \
- mv $@+ $@
5: b621f3b8e9 = 5: 2c330987b5 doc: avoid using rm directly
--
2.32.0.rc0
next reply other threads:[~2021-05-21 22:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 22:29 Felipe Contreras [this message]
2021-05-21 22:29 ` [PATCH v3 1/5] doc: refactor common asciidoc dependencies Felipe Contreras
2021-05-21 22:29 ` [PATCH v3 2/5] doc: improve " Felipe Contreras
2021-05-21 22:29 ` [PATCH v3 3/5] doc: remove unnecessary rm instances Felipe Contreras
2021-05-24 17:51 ` Junio C Hamano
2021-05-24 18:40 ` Felipe Contreras
2021-05-24 18:45 ` Felipe Contreras
2021-05-25 2:59 ` Junio C Hamano
2021-05-25 6:54 ` Felipe Contreras
2021-05-25 17:11 ` Junio C Hamano
2021-05-25 22:13 ` Felipe Contreras
2021-05-26 0:24 ` Felipe Contreras
2021-05-21 22:29 ` [PATCH v3 4/5] doc: simplify Makefile using .DELETE_ON_ERROR Felipe Contreras
2021-05-21 22:29 ` [PATCH v3 5/5] doc: avoid using rm directly Felipe Contreras
2021-05-24 17:51 ` [PATCH v3 0/5] doc: asciidoc cleanups Junio C Hamano
2021-05-27 14:32 ` Jeff King
2021-05-27 16:59 ` Felipe Contreras
2021-05-27 17:09 ` Jeff King
2021-05-27 17:35 ` Felipe Contreras
2021-05-28 0:02 ` Junio C Hamano
2021-05-28 1:12 ` Felipe Contreras
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=20210521222941.525901-1-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.