| Message ID | 20200925162316.21205-14-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Convert QAPI doc comments to generate rST instead of texinfo | expand |
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>
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()
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(-)