External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
We only use the HTML5 version these days.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Andrea Bolognani 2021-08-09 16:48:58 +02:00
parent 5de700c64f
commit 556022c4dc
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/go/meson.build
View File

@ -12,7 +12,7 @@ foreach name : docs_go_files
html_xslt_gen += { html_xslt_gen += {
'name': name, 'name': name,
'file': docs_rst2html_gen.process(rst_file), 'file': docs_rst2html5_gen.process(rst_file),
'source': 'docs' / 'go' / rst_file, 'source': 'docs' / 'go' / rst_file,
} }
endforeach endforeach

2
docs/kbase/meson.build
View File

@ -30,7 +30,7 @@ foreach name : docs_kbase_files
html_xslt_gen += { html_xslt_gen += {
'name': name, 'name': name,
'file': docs_rst2html_gen.process(rst_file), 'file': docs_rst2html5_gen.process(rst_file),
'source': 'docs/kbase' / rst_file, 'source': 'docs/kbase' / rst_file,
} }
endforeach endforeach

2
docs/manpages/meson.build
View File

@ -118,7 +118,7 @@ foreach data : docs_man_files
html_in_file, html_in_file,
input: rst_file, input: rst_file,
output: html_in_file, output: html_in_file,
command: [ rst2html_prog, '--stylesheet=', '--strict', '@INPUT@' ], command: [ rst2html5_prog, '--stylesheet=', '--strict', '@INPUT@' ],
capture: true, capture: true,
) )

8
docs/meson.build
View File

@ -183,8 +183,8 @@ docs_lxc_api_xml = docs_api_generated[1]
docs_qemu_api_xml = docs_api_generated[2] docs_qemu_api_xml = docs_api_generated[2]
docs_admin_api_xml = docs_api_generated[3] docs_admin_api_xml = docs_api_generated[3]
docs_rst2html_gen = generator( docs_rst2html5_gen = generator(
rst2html_prog, rst2html5_prog,
output: '@BASENAME@.html.in', output: '@BASENAME@.html.in',
arguments: [ '--stylesheet=', '--strict', '@INPUT@' ], arguments: [ '--stylesheet=', '--strict', '@INPUT@' ],
capture: true, capture: true,
@ -215,7 +215,7 @@ foreach name : docs_rst_files
rst_file = '@0@.rst'.format(name) rst_file = '@0@.rst'.format(name)
html_xslt_gen += { html_xslt_gen += {
'name': name, 'name': name,
'file': docs_rst2html_gen.process(rst_file), 'file': docs_rst2html5_gen.process(rst_file),
'source': 'docs' / rst_file, 'source': 'docs' / rst_file,
} }
endforeach endforeach
@ -252,7 +252,7 @@ html_xslt_gen += {
'file': hvsupport_html_in, '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 += { html_xslt_gen += {
'name': 'news', 'name': 'news',
'file': news_html_in, 'file': news_html_in,

2
meson.build
View File

@ -790,7 +790,7 @@ required_programs = [
required_programs_groups = [ required_programs_groups = [
{ 'name': 'rpcgen', 'prog': [ 'rpcgen', 'portable-rpcgen' ] }, { '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' ] }, { 'name': 'rst2man', 'prog': [ 'rst2man', 'rst2man.py', 'rst2man-3' ] },
] ]