On 10/08/20 21:36, Peter Maydell wrote: >> It should be possible and probably not too hard once I figure out how >> Sphinx events work. It's a fair request since build_always_stale is >> inferior and Meson requires no particular magic to include the depfile. >> Maybe that will win you over. :) >> >> I can also leave out sphinx from the initial conversion. > If we have a working-but-build-always conversion for Sphinx > I'd be happy to take that and then upgrade it to processing > the dependencies properly later. > > (The thing I'm not really looking forward to is updating > the qapi-doc-to-rst patchset to Meson...)
Since it's all handled internally by sphinx, I think you only need to add the man pages to the dictionary, and get rid of the corresponding Texinfo outputs in qapi/meson.build and qga/meson.build? In other words, it should be just this: diff --git a/qapi/meson.build b/qapi/meson.build index de5b16f..315252f 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -96,7 +96,7 @@ foreach module : qapi_all_modules endforeach qapi_files = custom_target('shared QAPI source files', - output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outputs + ['qapi-doc.texi'], + output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outputs, input: [ files('qapi-schema.json') ], command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ], depend_files: [ qapi_inputs, qapi_gen_depends ]) @@ -120,5 +120,3 @@ foreach output : qapi_specific_outputs + qapi_nonmodule_outputs specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) i = i + 1 endforeach - -qapi_doc_texi = qapi_files[i] diff --git a/qga/meson.build b/qga/meson.build index 6fdddd6..741b683 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -16,7 +16,7 @@ qga_qapi_outputs = [ ] qga_qapi_files = custom_target('QGA QAPI files', - output: qga_qapi_outputs + ['qga-qapi-doc.texi'], + output: qga_qapi_outputs, input: 'qapi-schema.json', command: [ qapi_gen, '-o', 'qga', '-p', 'qga-', '@INPUT0@' ], depend_files: qapi_gen_depends) @@ -27,7 +27,6 @@ foreach output: qga_qapi_outputs qga_ss.add(qga_qapi_files[i]) i = i + 1 endforeach -qga_qapi_doc_texi = qga_qapi_files[i] qga_ss.add(files( 'commands.c', Paolo