diff mbox series

[RFC,09/12] doc: remove references to xmlto

Message ID 20230413115745.116063-10-felipe.contreras@gmail.com (mailing list archive)
State New, archived
Headers show
Series doc: add tests and reimplement xmlto | expand

Commit Message

Felipe Contreras April 13, 2023, 11:57 a.m. UTC 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Documentation/Makefile           | 6 +++---
 Documentation/manpage-normal.xsl | 2 +-
 INSTALL                          | 4 ++--
 ci/install-dependencies.sh       | 2 +-
 shared.mak                       | 3 +--
 5 files changed, 8 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3e2cbef306..a85f60f766 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -155,7 +155,7 @@  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_EXTRA =
+XSLTPROC_EXTRA =
 INSTALL ?= install
 RM ?= rm -f
 MAN_REPO = ../../git-manpages
@@ -183,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)'
+XSLTPROC_EXTRA += --stringparam man.base.url.for.relative.links '$(MAN_BASE_URL)'
 
 ifdef USE_ASCIIDOCTOR
 ASCIIDOC = asciidoctor
@@ -332,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)xsltproc --nonet $(XMLTO_EXTRA) -o $@ manpage.xsl $<
+manpage-cmd = $(QUIET_XSLTPROC)xsltproc --nonet $(XSLTPROC_EXTRA) -o $@ manpage.xsl $<
 
 manpage.xsl: gen-stylesheet
 	./gen-stylesheet >"$@"
diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl
index a9c7ec69f4..3fb044a8a7 100644
--- a/Documentation/manpage-normal.xsl
+++ b/Documentation/manpage-normal.xsl
@@ -4,7 +4,7 @@ 
 		version="1.0">
 
 
-<!-- these params silence some output from xmlto -->
+<!-- these params silence some output from xsltproc -->
 <xsl:param name="man.output.quietly" select="1"/>
 <xsl:param name="refentry.meta.get.quietly" select="1"/>
 
diff --git a/INSTALL b/INSTALL
index 4b42288882..48c126b3be 100644
--- a/INSTALL
+++ b/INSTALL
@@ -176,13 +176,13 @@  Issues of note:
    the name is reserved for local settings.
 
  - To build and install documentation suite, you need to have
-   the asciidoc/xmlto toolchain.  Because not many people are
+   the asciidoc/xsltproc toolchain.  Because not many people are
    inclined to install the tools, the default build target
    ("make all") does _not_ build them.
 
    "make doc" builds documentation in man and html formats; there are
    also "make man", "make html" and "make info". Note that "make html"
-   requires asciidoc, but not xmlto. "make man" (and thus make doc)
+   requires asciidoc, but not xsltproc. "make man" (and thus make doc)
    requires both.
 
    "make install-doc" installs documentation in man format only; there
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 4f407530d3..fe72525f1f 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -69,7 +69,7 @@  sparse)
 	;;
 Documentation)
 	sudo apt-get -q update
-	sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make
+	sudo apt-get -q -y install asciidoc xsltproc docbook-xsl-ns make
 
 	test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
 	sudo gem install --version 1.5.8 asciidoctor
diff --git a/shared.mak b/shared.mak
index aeb80fc4d5..52fbc8ec6f 100644
--- a/shared.mak
+++ b/shared.mak
@@ -78,11 +78,10 @@  ifndef V
 
 ## Used in "Documentation/Makefile"
 	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
-	QUIET_XMLTO	= @echo '   ' XMLTO $@;
+	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;
 	QUIET_MAKEINFO	= @echo '   ' MAKEINFO $@;
 	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
-	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_GEN	= @echo '   ' GEN $@;
 	QUIET_STDERR	= 2> /dev/null