[libvirt] [PATCH 3/6] build: introduce rst2html as a mandatory build tool

Ján Tomko jtomko at redhat.com
Mon Nov 11 13:59:20 UTC 2019


On Fri, Nov 08, 2019 at 11:21:09AM +0000, Daniel P. Berrangé wrote:
>The rst2html tool is provided by python docutils, and as the name
>suggests, it converts RST documents into HTML.
>
>This enables us to start writing docs on our website in RST format
>instead of HTML, without changing the rest of our website templating
>system away from XSLT yet.
>
>Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
>---
> libvirt.spec.in              | 2 ++
> m4/virt-external-programs.m4 | 5 +++++
> mingw-libvirt.spec.in        | 1 +
> 3 files changed, 8 insertions(+)
>
>diff --git a/libvirt.spec.in b/libvirt.spec.in
>index dcad08cb5f..84efe47ffc 100644
>--- a/libvirt.spec.in
>+++ b/libvirt.spec.in
>@@ -260,6 +260,8 @@ BuildRequires: automake
> BuildRequires: gettext-devel
> BuildRequires: libtool
> BuildRequires: /usr/bin/pod2man
>+# Replace with python3-docutils when we drop py2 support
>+BuildRequires: /usr/bin/rst2html
> %endif
> BuildRequires: gcc
> BuildRequires: git
>diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4
>index 0f995998c3..b7779f159e 100644
>--- a/m4/virt-external-programs.m4
>+++ b/m4/virt-external-programs.m4
>@@ -33,6 +33,11 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
>   then
>     AC_MSG_ERROR("xsltproc is required to build libvirt")
>   fi
>+  AC_PATH_PROG([RST2HTML], [rst2html], [])

The program is called 'rst2html.py' on my Gentoo system
(from the dev-python/docutils package)

Jano

>+  if test -z "$RST2HTML"
>+  then
>+    AC_MSG_ERROR("rst2html is required to build libvirt")
>+  fi
>   AC_PATH_PROG([AUGPARSE], [augparse], [/usr/bin/augparse])
>   AC_PROG_MKDIR_P
>   AC_PROG_LN_S
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20191111/8d2fab57/attachment-0001.sig>


More information about the libvir-list mailing list