[libvirt PATCH 1/2] meson: Use 'rst2html5' instead of 'rst2html' everywhere

We only use the HTML5 version these days. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- docs/go/meson.build | 2 +- docs/kbase/meson.build | 2 +- docs/manpages/meson.build | 2 +- docs/meson.build | 8 ++++---- meson.build | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/go/meson.build b/docs/go/meson.build index d2accd322b..0ae0216ce3 100644 --- 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 6d17a83d1d..8d8fd695ea 100644 --- 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 0fa93fad89..fe91a43614 100644 --- 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 4497f7270f..cbc138fa1f 100644 --- 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 e25dc17fc8..32ad688c9c 100644 --- 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' ] }, ] -- 2.31.1