[RFC PATCH 07/12] doc: get rid of xmlto dependency
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Apr 13, 2023, 11:57 UTC
- Message-ID
- <20230413115745.116063-8-felipe.contreras@gmail.com>
- In-Reply-To
- <20230413115745.116063-1-felipe.contreras@gmail.com>
We don't use any of its functionality, so all it's doing for us is generate a stylesheet, which we are doing by ourselves now.
Use `xsltproc` directly.
This gets rid of some annoying warnings because my system doesn't use debian's libpaper:
(null): unknown option '-n' (null): unknown option '-mh' (null): unknown option '-mw'
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- Documentation/Makefile | 6 ++---- t/t0600-doc-tools.sh | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile index 96d3f52c60..3e2cbef306 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -155,7 +155,6 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) -XMLTO = xmlto XMLTO_EXTRA = INSTALL ?= install RM ?= rm -f @@ -184,7 +183,7 @@ endif ifndef MAN_BASE_URL MAN_BASE_URL = file://$(htmldir)/ endif -XMLTO_EXTRA += --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)' +XMLTO_EXTRA += --stringparam man.base.url.for.relative.links '$(MAN_BASE_URL)' ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor @@ -196,7 +195,6 @@ ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = -XMLTO_EXTRA += --skip-validation endif SHELL_PATH ?= $(SHELL) @@ -334,7 +332,7 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-prereqs := manpage.xsl $(wildcard manpage*.xsl) -manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -x manpage.xsl $(XMLTO_EXTRA) man $< +manpage-cmd = $(QUIET_XMLTO)xsltproc --nonet $(XMLTO_EXTRA) -o $@ manpage.xsl $< manpage.xsl: gen-stylesheet ./gen-stylesheet >"$@" diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index a003686c2f..0af431941d 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -57,9 +57,7 @@ EOF "$doc_dir"/gen-stylesheet >"$doc_dir"/manpage.xsl xmltoman() { - base="$1" - shift - xmlto --skip-validation -x "$doc_dir"/manpage.xsl man "$base.xml" + xsltproc --nonet -o "$1.1" "$doc_dir/manpage.xsl" "$1.xml" } build_asciidoc_py() {
-- 2.40.0+fc1