{"thread":{"id":"46276","subject":"[PATCH] subtree: Obey USE_ASCIIDOCTOR when present","startedAt":"2017-06-28T02:56:21Z","lastAt":"2017-06-28T03:57:30Z","messageCount":2,"participants":["A. Wilcox","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"323408","messageId":"20170628024916.32235-1-AWilcox@Wilcox-Tech.com","threadId":"46276","inReplyTo":null,"subject":"[PATCH] subtree: Obey USE_ASCIIDOCTOR when present","fromName":"A. Wilcox","fromEmail":"awilcox@wilcox-tech.com","sentAt":"2017-06-28T02:49:16Z","receivedAt":"2017-06-28T02:56:21Z","isPatch":true,"sender":{"key":"awilcox@wilcox-tech.com","avatar":null},"body":"Defining USE_ASCIIDOCTOR=1 when building Git uses asciidoctor over\nasciidoc when generating DocBook and man page documentation.  However,\nthe contrib/subtree module does not presently honour that flag.\n\nThis causes a build failure when asciidoc is not present on the build\nsystem.  Instead, adapt the main Documentation/Makefile logic to use\nasciidoctor when requested.\n\nSigned-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>\n---\n contrib/subtree/Makefile | 26 +++++++++++++++++++-------\n 1 file changed, 19 insertions(+), 7 deletions(-)\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 6afa9aa..1b8fcd1 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -19,15 +19,27 @@ htmldir ?= $(prefix)/share/doc/git-doc\n INSTALL  ?= install\n RM       ?= rm -f\n \n-ASCIIDOC = asciidoc\n-XMLTO    = xmlto\n+ASCIIDOC         = asciidoc\n+ASCIIDOC_CONF    = -f ../../Documentation/asciidoc.conf\n+ASCIIDOC_HTML    = xhtml11\n+ASCIIDOC_DOCBOOK = docbook\n+ASCIIDOC_EXTRA   = \n+XMLTO            = xmlto\n+\n+ifdef USE_ASCIIDOCTOR\n+ASCIIDOC         = asciidoctor\n+ASCIIDOC_CONF    =\n+ASCIIDOC_HTML    = xhtml5\n+ASCIIDOC_DOCBOOK = docbook45\n+ASCIIDOC_EXTRA  += -I../../Documentation -rasciidoctor-extensions\n+ASCIIDOC_EXTRA  += -alitdd='&\\#x2d;&\\#x2d;'\n+endif\n \n ifndef SHELL_PATH\n \tSHELL_PATH = /bin/sh\n endif\n SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))\n \n-ASCIIDOC_CONF = ../../Documentation/asciidoc.conf\n MANPAGE_XSL   = ../../Documentation/manpage-normal.xsl\n \n GIT_SUBTREE_SH := git-subtree.sh\n@@ -65,12 +77,12 @@ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)\n \t$(XMLTO) -m $(MANPAGE_XSL) man $^\n \n $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n-\t$(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \\\n-\t\t-agit_version=$(GIT_VERSION) $^\n+\t$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \\\n+\t\t-agit_version=$(GIT_VERSION) $(ASCIIDOC_EXTRA) $^\n \n $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)\n-\t$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \\\n-\t\t-agit_version=$(GIT_VERSION) $^\n+\t$(ASCIIDOC) -b $(ASCIIDOC_HTML) -d manpage $(ASCIIDOC_CONF) \\\n+\t\t-agit_version=$(GIT_VERSION) $(ASCIIDOC_EXTRA) $^\n \n $(GIT_SUBTREE_TEST): $(GIT_SUBTREE)\n \tcp $< $@\n-- \n2.10.0\n\n"},{"id":"323413","messageId":"xmqqo9t8ydb1.fsf@gitster.mtv.corp.google.com","threadId":"46276","inReplyTo":"20170628024916.32235-1-AWilcox@Wilcox-Tech.com","subject":"Re: [PATCH] subtree: Obey USE_ASCIIDOCTOR when present","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-06-28T03:57:22Z","receivedAt":"2017-06-28T03:57:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"A. Wilcox\" <AWilcox@Wilcox-Tech.com> writes:\n\n> Defining USE_ASCIIDOCTOR=1 when building Git uses asciidoctor over\n> asciidoc when generating DocBook and man page documentation.  However,\n> the contrib/subtree module does not presently honour that flag.\n>\n> This causes a build failure when asciidoc is not present on the build\n> system.  Instead, adapt the main Documentation/Makefile logic to use\n> asciidoctor when requested.\n>\n> Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>\n> ---\n\nMakes sense.  Thanks.  Will queue.\n\n>  contrib/subtree/Makefile | 26 +++++++++++++++++++-------\n>  1 file changed, 19 insertions(+), 7 deletions(-)\n>\n> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\n> index 6afa9aa..1b8fcd1 100644\n> --- a/contrib/subtree/Makefile\n> +++ b/contrib/subtree/Makefile\n> @@ -19,15 +19,27 @@ htmldir ?= $(prefix)/share/doc/git-doc\n>  INSTALL  ?= install\n>  RM       ?= rm -f\n>  \n> -ASCIIDOC = asciidoc\n> -XMLTO    = xmlto\n> +ASCIIDOC         = asciidoc\n> +ASCIIDOC_CONF    = -f ../../Documentation/asciidoc.conf\n> +ASCIIDOC_HTML    = xhtml11\n> +ASCIIDOC_DOCBOOK = docbook\n> +ASCIIDOC_EXTRA   = \n> +XMLTO            = xmlto\n> +\n> +ifdef USE_ASCIIDOCTOR\n> +ASCIIDOC         = asciidoctor\n> +ASCIIDOC_CONF    =\n> +ASCIIDOC_HTML    = xhtml5\n> +ASCIIDOC_DOCBOOK = docbook45\n> +ASCIIDOC_EXTRA  += -I../../Documentation -rasciidoctor-extensions\n> +ASCIIDOC_EXTRA  += -alitdd='&\\#x2d;&\\#x2d;'\n> +endif\n>  \n>  ifndef SHELL_PATH\n>  \tSHELL_PATH = /bin/sh\n>  endif\n>  SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))\n>  \n> -ASCIIDOC_CONF = ../../Documentation/asciidoc.conf\n>  MANPAGE_XSL   = ../../Documentation/manpage-normal.xsl\n>  \n>  GIT_SUBTREE_SH := git-subtree.sh\n> @@ -65,12 +77,12 @@ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)\n>  \t$(XMLTO) -m $(MANPAGE_XSL) man $^\n>  \n>  $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n> -\t$(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \\\n> -\t\t-agit_version=$(GIT_VERSION) $^\n> +\t$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \\\n> +\t\t-agit_version=$(GIT_VERSION) $(ASCIIDOC_EXTRA) $^\n>  \n>  $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)\n> -\t$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \\\n> -\t\t-agit_version=$(GIT_VERSION) $^\n> +\t$(ASCIIDOC) -b $(ASCIIDOC_HTML) -d manpage $(ASCIIDOC_CONF) \\\n> +\t\t-agit_version=$(GIT_VERSION) $(ASCIIDOC_EXTRA) $^\n>  \n>  $(GIT_SUBTREE_TEST): $(GIT_SUBTREE)\n>  \tcp $< $@\n"}]}