Re: [PATCH 135/147] meson: sphinx-build

[Peter Maydell]

On Mon, 10 Aug 2020 at 19:16, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

> diff --git a/configure b/configure
> index 21b9ed2..7e7b4d8 100755
> --- a/configure
> +++ b/configure
> @@ -7768,7 +7768,6 @@ echo "INSTALL_PROG=$install -c -m 0755" >> 
> $config_host_mak
>  echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak
>  echo "PYTHON=$python" >> $config_host_mak
>  echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
> -echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak

Shouldn't we also be deleting the code in configure that
sets $sphinx_werror if we're no longer using it ?

> +    these_man_pages = []
> +    install_dirs = []
> +    foreach page, section : man_pages.get(manual, {})
> +      these_man_pages += page
> +      install_dirs += section == '' ? false : get_option('mandir') / section
> +    endforeach
> +    if these_man_pages.length() > 0
> +      sphinxmans += custom_target(manual + ' man pages',
> +                         build_always_stale: true,
> +                         build_by_default: build_docs,
> +                         output: these_man_pages,
> +                         install: build_docs,
> +                         install_dir: install_dirs,
> +                         command: [SPHINX_ARGS, '-b', 'man', '-d', 
> private_dir,
> +                                   input_dir, meson.current_build_dir()])
> +    endif
> +  endforeach
> +  alias_target('sphinxdocs', sphinxdocs)
> +  alias_target('man', sphinxmans)

Does "build_always_stale: true" do what I guess it does from the
name? Does this mean we're discarding the makefile's approach of
only running sphinx if it's necessary in favour of always running
half a dozen sphinx invocations every build ?

thanks
-- PMM