[PATCH] subtree: fix build with AsciiDoctor 2

Johannes Schindelin via GitGitGadget· Apr 8, 2020, 14:25 UTC · lore

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(-)

Show changes to contrib/subtree/Makefile +4 −2

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

Junio C Hamano· Apr 8, 2020, 19:09 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH] subtree: fix build with AsciiDoctor 2

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 11 quoted lines

> 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.

Show 40 quoted lines

> 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

patchsubtree: fix build with AsciiDoctor 2