Hi
On Sat, Oct 9, 2021 at 2:09 AM <marcandre.lur...@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> This is now generated automatically by depfile.py.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> docs/meson.build | 10 ----------
> tests/qapi-schema/meson.build | 5 ++++-
> 2 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/docs/meson.build b/docs/meson.build
> index be4dc30f39..6177c967ff 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -37,15 +37,6 @@ endif
> if build_docs
> SPHINX_ARGS += ['-Dversion=' + meson.project_version(), '-Drelease=' +
> config_host['PKGVERSION']]
>
> - sphinx_extn_depends = [ meson.current_source_dir() /
> 'sphinx/depfile.py',
> - meson.current_source_dir() / 'sphinx/hxtool.py',
> - meson.current_source_dir() /
> 'sphinx/kerneldoc.py',
> - meson.current_source_dir() /
> 'sphinx/kernellog.py',
> - meson.current_source_dir() /
> 'sphinx/qapidoc.py',
> - meson.current_source_dir() /
> 'sphinx/qmp_lexer.py',
> - qapi_gen_depends ]
> - sphinx_template_files = [ meson.project_source_root() /
> 'docs/_templates/footer.html' ]
> -
> have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
>
> man_pages = {
> @@ -77,7 +68,6 @@ if build_docs
> output: 'docs.stamp',
> input: files('conf.py'),
> depfile: 'docs.d',
> - depend_files: [ sphinx_extn_depends,
> sphinx_template_files ],
> command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@',
> '-Ddepfile_stamp=@OUTPUT0@',
> '-b', 'html', '-d', private_dir,
> diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
> index df5acfd08b..a5eae6253f 100644
> --- a/tests/qapi-schema/meson.build
> +++ b/tests/qapi-schema/meson.build
> @@ -241,7 +241,8 @@ if build_docs
> output: ['doc-good.txt'],
> input: files('doc-good.json',
> 'doc-good.rst'),
> build_by_default: true,
> - depend_files: sphinx_extn_depends,
> + output: 'docs.stamp',
>
This line should be removed (it breaks the test)
+ depfile: 'docs.d',
> # We use -E to suppress Sphinx's caching,
> because
> # we want it to always really run the QAPI
> doc
> # generation code. It also means we don't
> @@ -250,6 +251,8 @@ if build_docs
> '-b', 'text', '-E',
> '-c',
> meson.project_source_root() / 'docs',
> '-D', 'master_doc=doc-good',
> + '-Ddepfile=@DEPFILE@',
> + '-Ddepfile_stamp=@OUTPUT0@',
> meson.current_source_dir(),
> meson.current_build_dir()])
>
> --
> 2.33.0.721.g106298f7f9
>
>
>
--
Marc-André Lureau
