Re: [PULL 11/21] docs: Build and install all the docs in a single manual

[Stefan Weil]

Am 12.01.21 um 17:57 schrieb Peter Maydell:
[...]
> diff --git a/docs/meson.build b/docs/meson.build
> index fae9849b79b..bb14eaebd3b 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -46,19 +46,11 @@ if build_docs
>                             meson.source_root() / 'docs/sphinx/qmp_lexer.py',
>                             qapi_gen_depends ]
>   
> -  configure_file(output: 'index.html',
> -                 input: files('index.html.in'),
> -                 configuration: {'VERSION': meson.project_version()},
> -                 install_dir: qemu_docdir)
> -  manuals = [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ]
>     man_pages = {
> -    'interop' : {
>           'qemu-ga.8': (have_tools ? 'man8' : ''),
>           'qemu-ga-ref.7': 'man7',
>           'qemu-qmp-ref.7': 'man7',
>           'qemu-storage-daemon-qmp-ref.7': (have_tools ? 'man7' : ''),
> -    },
> -    'tools': {
>           'qemu-img.1': (have_tools ? 'man1' : ''),
>           'qemu-nbd.8': (have_tools ? 'man8' : ''),
>           'qemu-pr-helper.8': (have_tools ? 'man8' : ''),
> @@ -66,53 +58,47 @@ if build_docs
>           'qemu-trace-stap.1': (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 
> 'man1' : ''),
>           'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
>           'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
> -    },
> -    'system': {
>           'qemu.1': 'man1',
>           'qemu-block-drivers.7': 'man7',
>           'qemu-cpu-models.7': 'man7'
> -    },
>     }
>   
>     sphinxdocs = []
>     sphinxmans = []
> -  foreach manual : manuals
> -    private_dir = meson.current_build_dir() / (manual + '.p')
> -    output_dir = meson.current_build_dir() / manual
> -    input_dir = meson.current_source_dir() / manual
>   
> -    this_manual = custom_target(manual + ' manual',
> +  private_dir = meson.current_build_dir() / 'manual.p'
> +  output_dir = meson.current_build_dir() / 'manual'
> +  input_dir = meson.current_source_dir()
> +
> +  this_manual = custom_target('QEMU manual',
>                   build_by_default: build_docs,
> -                output: [manual + '.stamp'],
> -                input: [files('conf.py'), files(manual / 'conf.py')],
> -                depfile: manual + '.d',
> +                output: 'docs.stamp',
> +                input: files('conf.py'),
> +                depfile: 'docs.d',
>                   depend_files: sphinx_extn_depends,
>                   command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@',
>                             '-Ddepfile_stamp=@OUTPUT0@',
>                             '-b', 'html', '-d', private_dir,
>                             input_dir, output_dir])
> -    sphinxdocs += this_manual
> -    if build_docs and manual != 'devel'
> -      install_subdir(output_dir, install_dir: qemu_docdir)
> -    endif
> +  sphinxdocs += this_manual
> +  install_subdir(output_dir, install_dir: qemu_docdir, strip_directory: true)

This line causes a build warning with the latest code:

../../../docs/meson.build:74: WARNING: Project targets '>=0.61.3' but 
uses feature deprecated since '0.60.0': install_subdir with empty 
directory. It worked by accident and is buggy. Use install_emptydir instead.

It looks like `qemu_docdir` is no longer defined anywhere.

I still did not find out whether this is an issue which needs a fix for 7.2.

Stefan

>   
> -    these_man_pages = []
> -    install_dirs = []
[...]