[2/2] meson: split the summary in multiple sections

Commit Message

Paolo Bonzini Jan. 20, 2021, 5:23 p.m. UTC

Signed-off-by: Paolo Bonzini <[e-mail]>
---
 meson.build | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé Jan. 20, 2021, 5:40 p.m. UTC | #1

On 1/20/21 6:23 PM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <[e-mail]>
> ---
>  meson.build | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 75ce835d48..3d2ac1a399 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2238,9 +2238,8 @@ endif
>  # Configuration summary #
>  #########################
>  
> -summary_info = {}
> -
>  # Generic information
> +summary_info = {}
>  summary_info += {'Install prefix':    get_option('prefix')}
>  summary_info += {'BIOS directory':    qemu_datadir}
>  summary_info += {'firmware path':     get_option('qemu_firmwarepath')}
> @@ -2263,8 +2262,10 @@ summary_info += {'GIT binary':        config_host['GIT']}
>  summary_info += {'GIT submodules':    config_host['GIT_SUBMODULES']}
>  summary_info += {'Documentation':     build_docs}
>  summary_info += {'Install blobs':     get_option('install_blobs')}
> +summary(summary_info, bool_yn: true)
>  
>  # Compilation information
> +summary_info = {}

I tried that, ...

>  summary_info += {'host CPU':          cpu}
>  summary_info += {'host endianness':   build_machine.endian()}
>  summary_info += {'C compiler':        meson.get_compiler('c').cmd_array()[0]}
> @@ -2322,8 +2323,10 @@ if targetos == 'windows'
>      summary_info += {'Windows SDK':       config_host['WIN_SDK']}
>    endif
>  endif
> +summary(summary_info, bool_yn: true, section: 'Compilation')

... but not that :)

I am still adding some sections in my branch. Only one is
useful so far: "Crypto".

Thanks for improving the summary!

Patch

diff --git a/meson.build b/meson.build
index 75ce835d48..3d2ac1a399 100644
--- a/meson.build
+++ b/meson.build
@@ -2238,9 +2238,8 @@  endif
 # Configuration summary #
 #########################
 
-summary_info = {}
-
 # Generic information
+summary_info = {}
 summary_info += {'Install prefix':    get_option('prefix')}
 summary_info += {'BIOS directory':    qemu_datadir}
 summary_info += {'firmware path':     get_option('qemu_firmwarepath')}
@@ -2263,8 +2262,10 @@  summary_info += {'GIT binary':        config_host['GIT']}
 summary_info += {'GIT submodules':    config_host['GIT_SUBMODULES']}
 summary_info += {'Documentation':     build_docs}
 summary_info += {'Install blobs':     get_option('install_blobs')}
+summary(summary_info, bool_yn: true)
 
 # Compilation information
+summary_info = {}
 summary_info += {'host CPU':          cpu}
 summary_info += {'host endianness':   build_machine.endian()}
 summary_info += {'C compiler':        meson.get_compiler('c').cmd_array()[0]}
@@ -2322,8 +2323,10 @@  if targetos == 'windows'
     summary_info += {'Windows SDK':       config_host['WIN_SDK']}
   endif
 endif
+summary(summary_info, bool_yn: true, section: 'Compilation')
 
 # Host binaries
+summary_info = {}
 summary_info += {'make':              config_host['MAKE']}
 summary_info += {'python':            '@0@ (version: @1@)'.format(python.full_path(), python.language_version())}
 summary_info += {'sphinx-build':      sphinx_build.found()}
@@ -2337,8 +2340,10 @@  if slirp_opt != 'disabled'
   summary_info += {'smbd':            config_host['CONFIG_SMBD_COMMAND']}
 endif
 summary_info += {'sparse enabled':    sparse.found()}
+summary(summary_info, bool_yn: true, section: 'Host binaries')
 
 # Targets and accelerators
+summary_info = {}
 summary_info += {'target list':       ' '.join(target_dirs)}
 
 if have_system
@@ -2356,8 +2361,10 @@  if config_all.has_key('CONFIG_TCG')
   summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')}
   summary_info += {'TCG interpreter':   tcg_arch == 'tci'}
 endif
+summary(summary_info, bool_yn: true, section: 'Targets')
 
 # Block layer
+summary_info = {}
 summary_info += {'block layer':       have_block}
 if have_block
   summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
@@ -2374,6 +2381,7 @@  if have_block
   summary_info += {'parallels support': config_host.has_key('CONFIG_PARALLELS')}
   summary_info += {'sheepdog support':  config_host.has_key('CONFIG_SHEEPDOG')}
 endif
+summary(summary_info, bool_yn: true, section: 'Block device support')
 
 # Features
 summary_info += {'module support':    config_host.has_key('CONFIG_MODULES')}
@@ -2411,8 +2419,10 @@  summary_info += {'Trace backends':    config_host['TRACE_BACKENDS']}
 if config_host['TRACE_BACKENDS'].split().contains('simple')
   summary_info += {'Trace output file': config_host['CONFIG_TRACE_FILE'] + '-<pid>'}
 endif
+summary(summary_info, bool_yn: true, section: 'Configurable features')
 
 # Libraries
+summary_info = {}
 if targetos == 'darwin'
   summary_info += {'Cocoa support':   cocoa.found()}
 endif
@@ -2492,7 +2502,7 @@  summary_info += {'libudev':           libudev.found()}
 summary_info += {'Linux keyring':     config_host.has_key('CONFIG_SECRET_KEYRING')}
 summary_info += {'FUSE exports':      fuse.found()}
 summary_info += {'FUSE lseek':        fuse_lseek.found()}
-summary(summary_info, bool_yn: true)
+summary(summary_info, bool_yn: true, section: 'Dependencies')
 
 if not supported_cpus.contains(cpu)
   message()