[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v6 13/21] meson.build: Move SPHINX_ARGS to top level meson.bu
From: |
Markus Armbruster |
Subject: |
Re: [PATCH v6 13/21] meson.build: Move SPHINX_ARGS to top level meson.build file |
Date: |
Tue, 29 Sep 2020 10:45:10 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) |
Peter Maydell <peter.maydell@linaro.org> writes:
> We're going to want to use SPHINX_ARGS in both docs/meson.build
> and tests/qapi-schema/meson.build. Move the definition up to the
> top level file so it is available to both subdirectories.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> docs/meson.build | 8 --------
> meson.build | 8 ++++++++
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/docs/meson.build b/docs/meson.build
> index 69097e2ca07..99da609e813 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -1,11 +1,3 @@
> -SPHINX_ARGS = [config_host['SPHINX_BUILD'],
> - '-Dversion=' + meson.project_version(),
> - '-Drelease=' + config_host['PKGVERSION']]
> -
> -if get_option('werror')
> - SPHINX_ARGS += [ '-W' ]
> -endif
> -
> if build_docs
> configure_file(output: 'index.html',
> input: files('index.html.in'),
> diff --git a/meson.build b/meson.build
> index 73d675ca834..6408ad442ea 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -671,6 +671,14 @@ foreach d : hx_headers
> endforeach
> genh += hxdep
>
> +SPHINX_ARGS = [config_host['SPHINX_BUILD'],
> + '-Dversion=' + meson.project_version(),
> + '-Drelease=' + config_host['PKGVERSION']]
> +
> +if get_option('werror')
> + SPHINX_ARGS += [ '-W' ]
> +endif
> +
> # Collect sourcesets.
>
> util_ss = ss.source_set()
I double-checked we still pass SPHINX_ARGS to sphinx.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
- Re: [PATCH v6 15/21] tests/qapi-schema: Add test of the rST QAPI doc-comment outputn, (continued)
[PATCH v6 14/21] meson.build: Make manuals depend on source to Sphinx extensions, Peter Maydell, 2020/09/25
[PATCH v6 10/21] qapi: Use rST markup for literal blocks, Peter Maydell, 2020/09/25
[PATCH v6 20/21] configure: Drop texinfo requirement, Peter Maydell, 2020/09/25
[PATCH v6 12/21] tests/qapi-schema: Convert doc-good.json to rST-style strong/emphasis, Peter Maydell, 2020/09/25
[PATCH v6 13/21] meson.build: Move SPHINX_ARGS to top level meson.build file, Peter Maydell, 2020/09/25
- Re: [PATCH v6 13/21] meson.build: Move SPHINX_ARGS to top level meson.build file,
Markus Armbruster <=
[PATCH v6 17/21] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions, Peter Maydell, 2020/09/25
[PATCH v6 16/21] scripts/qapi: Remove texinfo generation support, Peter Maydell, 2020/09/25
[PATCH v6 18/21] scripts/texi2pod: Delete unused script, Peter Maydell, 2020/09/25
[PATCH v6 19/21] Remove Texinfo related line from git.orderfile, Peter Maydell, 2020/09/25