* [PATCH] subtree: fix build with AsciiDoctor 2
@ 2020-04-08 14:25 Johannes Schindelin via GitGitGadget
2020-04-08 19:09 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2020-04-08 14:25 UTC (permalink / raw)
To: git; +Cc: Johannes Schindelin, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
This is a (late) companion for f6461b82b93 (Documentation: fix build
with Asciidoctor 2, 2019-09-15).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Adjust contrib/subtree to AsciiDoctor 2, too
This is something I had to do because the Git for Windows release
process now offers only AsciiDoctor 2.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-600%2Fdscho%2Fsubtree-and-docbook-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-600/dscho/subtree-and-docbook-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/600
contrib/subtree/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 6906aae4414..6fa7496bfdb 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11
ASCIIDOC_DOCBOOK = docbook
ASCIIDOC_EXTRA =
XMLTO = xmlto
+XMLTO_EXTRA =
ifdef USE_ASCIIDOCTOR
ASCIIDOC = asciidoctor
ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
-ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_DOCBOOK = docbook
ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
+XMLTO_EXTRA += --skip-validation
endif
ifndef SHELL_PATH
@@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
- $(XMLTO) -m $(MANPAGE_XSL) man $^
+ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] subtree: fix build with AsciiDoctor 2
2020-04-08 14:25 [PATCH] subtree: fix build with AsciiDoctor 2 Johannes Schindelin via GitGitGadget
@ 2020-04-08 19:09 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-04-08 19:09 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> This is a (late) companion for f6461b82b93 (Documentation: fix build
> with Asciidoctor 2, 2019-09-15).
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Adjust contrib/subtree to AsciiDoctor 2, too
>
> This is something I had to do because the Git for Windows release
> process now offers only AsciiDoctor 2.
Thanks. The original justifies its change quite well, and its
reasoning applies perfectly well here, too.
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-600%2Fdscho%2Fsubtree-and-docbook-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-600/dscho/subtree-and-docbook-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/600
>
> contrib/subtree/Makefile | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
> index 6906aae4414..6fa7496bfdb 100644
> --- a/contrib/subtree/Makefile
> +++ b/contrib/subtree/Makefile
> @@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11
> ASCIIDOC_DOCBOOK = docbook
> ASCIIDOC_EXTRA =
> XMLTO = xmlto
> +XMLTO_EXTRA =
>
> ifdef USE_ASCIIDOCTOR
> ASCIIDOC = asciidoctor
> ASCIIDOC_CONF =
> ASCIIDOC_HTML = xhtml5
> -ASCIIDOC_DOCBOOK = docbook45
> +ASCIIDOC_DOCBOOK = docbook
> ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
> ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
> +XMLTO_EXTRA += --skip-validation
> endif
>
> ifndef SHELL_PATH
> @@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
> $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
>
> $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
> - $(XMLTO) -m $(MANPAGE_XSL) man $^
> + $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
>
> $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
> $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
>
> base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-08 19:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-08 14:25 [PATCH] subtree: fix build with AsciiDoctor 2 Johannes Schindelin via GitGitGadget
2020-04-08 19:09 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).