meson: Use 'rst2html5' instead of 'rst2html' everywhere

We only use the HTML5 version these days.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/docs/go/meson.build b/docs/go/meson.build
index d2accd322b985aadbfe4ca40bc744cfce19dc771..0ae0216ce3ac0b4f6f6510b6291ea4f1e6e66f20 100644 (file)
--- a/docs/go/meson.build
+++ b/docs/go/meson.build
@@ -12,7 +12,7 @@ foreach name : docs_go_files
 
   html_xslt_gen += {
     'name': name,
-    'file': docs_rst2html_gen.process(rst_file),
+    'file': docs_rst2html5_gen.process(rst_file),
     'source': 'docs' / 'go' / rst_file,
   }
 endforeach

diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
index 6d17a83d1d44c676b3a29634a6760f170d7a2449..8d8fd695ea46364f75ad51ab324452cbae838372 100644 (file)
--- a/docs/kbase/meson.build
+++ b/docs/kbase/meson.build
@@ -30,7 +30,7 @@ foreach name : docs_kbase_files
 
   html_xslt_gen += {
     'name': name,
-    'file': docs_rst2html_gen.process(rst_file),
+    'file': docs_rst2html5_gen.process(rst_file),
     'source': 'docs/kbase' / rst_file,
   }
 endforeach

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index 0fa93fad893c8c936e251cabafd8d9f34dd07366..fe91a4361464691ce351fbde9bc3d1e84a0847a9 100644 (file)
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -118,7 +118,7 @@ foreach data : docs_man_files
     html_in_file,
     input: rst_file,
     output: html_in_file,
-    command: [ rst2html_prog, '--stylesheet=', '--strict', '@INPUT@' ],
+    command: [ rst2html5_prog, '--stylesheet=', '--strict', '@INPUT@' ],
     capture: true,
   )
 

diff --git a/docs/meson.build b/docs/meson.build
index 4497f7270f9e16685fc3b0f5329816e3ec240705..cbc138fa1f4e3a14d6e8ae6e144cfe2d2a3a01bb 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -183,8 +183,8 @@ docs_lxc_api_xml = docs_api_generated[1]
 docs_qemu_api_xml = docs_api_generated[2]
 docs_admin_api_xml = docs_api_generated[3]
 
-docs_rst2html_gen = generator(
-  rst2html_prog,
+docs_rst2html5_gen = generator(
+  rst2html5_prog,
   output: '@BASENAME@.html.in',
   arguments: [ '--stylesheet=', '--strict', '@INPUT@' ],
   capture: true,
@@ -215,7 +215,7 @@ foreach name : docs_rst_files
   rst_file = '@0@.rst'.format(name)
   html_xslt_gen += {
     'name': name,
-    'file': docs_rst2html_gen.process(rst_file),
+    'file': docs_rst2html5_gen.process(rst_file),
     'source': 'docs' / rst_file,
   }
 endforeach
@@ -252,7 +252,7 @@ html_xslt_gen += {
   'file': hvsupport_html_in,
 }
 
-news_html_in = docs_rst2html_gen.process(meson.source_root() / 'NEWS.rst')
+news_html_in = docs_rst2html5_gen.process(meson.source_root() / 'NEWS.rst')
 html_xslt_gen += {
   'name': 'news',
   'file': news_html_in,

diff --git a/meson.build b/meson.build
index e25dc17fc8199fb0b68658cb030742d746943cfc..32ad688c9c8ea4b73a706661dbe3104b1bfe9a91 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -790,7 +790,7 @@ required_programs = [
 
 required_programs_groups = [
   { 'name': 'rpcgen', 'prog': [ 'rpcgen', 'portable-rpcgen' ] },
-  { 'name': 'rst2html', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5-3' ] },
+  { 'name': 'rst2html5', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5-3' ] },
   { 'name': 'rst2man', 'prog': [ 'rst2man', 'rst2man.py', 'rst2man-3' ] },
 ]