[libvirt PATCH 25/26] meson: Reorganize summary

[Andrea Bolognani]

Different types of drivers are more accurately sorted into
separate categories, the "Windows" section has been absorbed
into a more generic "Target" section which also contains other
information about the OS configuration, and some other smaller
tweaks have been applied.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 meson.build | 90 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/meson.build b/meson.build
index 1d9c878fd0..a5f6ed6f9f 100644
--- a/meson.build
+++ b/meson.build
@@ -2208,7 +2208,7 @@ endforeach
 
 # print configuration summary
 
-driver_summary = {
+hypervisordriver_summary = {
   'QEMU': conf.has('WITH_QEMU'),
   'OpenVZ': conf.has('WITH_OPENVZ'),
   'VMware': conf.has('WITH_VMWARE'),
@@ -2219,13 +2219,8 @@ driver_summary = {
   'Hyper-V': conf.has('WITH_HYPERV'),
   'vz': conf.has('WITH_VZ'),
   'Bhyve': conf.has('WITH_BHYVE'),
-  'Test': conf.has('WITH_TEST'),
-  'Remote': conf.has('WITH_REMOTE'),
-  'Network': conf.has('WITH_NETWORK'),
-  'Libvirtd': conf.has('WITH_LIBVIRTD'),
-  'Interface': conf.has('WITH_INTERFACE'),
 }
-summary(driver_summary, section: 'Drivers', bool_yn: true)
+summary(hypervisordriver_summary, section: 'Hypervisor drivers', bool_yn: true)
 
 storagedriver_summary = {
   'Dir': conf.has('WITH_STORAGE_DIR'),
@@ -2243,18 +2238,21 @@ storagedriver_summary = {
   'ZFS': conf.has('WITH_STORAGE_ZFS'),
   'Virtuozzo storage': conf.has('WITH_STORAGE_VSTORAGE'),
 }
-summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true)
+summary(storagedriver_summary, section: 'Storage drivers', bool_yn: true)
 
 secdriver_summary = {
   'SELinux': conf.has('WITH_SECDRIVER_SELINUX'),
   'AppArmor': conf.has('WITH_SECDRIVER_APPARMOR'),
 }
-summary(secdriver_summary, section: 'Security Drivers', bool_yn: true)
+summary(secdriver_summary, section: 'Security drivers', bool_yn: true)
 
-drivermod_summary = {
-  'driver_modules': driver_modules_flags.length() > 0,
+otherdriver_summary = {
+  'Test': conf.has('WITH_TEST'),
+  'Remote': conf.has('WITH_REMOTE'),
+  'Network': conf.has('WITH_NETWORK'),
+  'Interface': conf.has('WITH_INTERFACE'),
 }
-summary(drivermod_summary, section: 'Driver Loadable Modules', bool_yn: true)
+summary(otherdriver_summary, section: 'Other drivers', bool_yn: true)
 
 libs_summary = {
   'acl': acl_dep.found(),
@@ -2296,54 +2294,60 @@ libs_summary = {
 }
 summary(libs_summary, section: 'Libraries', bool_yn: true)
 
-win_summary = {
-  'MinGW': host_machine.system() == 'windows',
-  'windres': host_machine.system() == 'windows',
+feature_summary = {
+  'DTrace': conf.has('WITH_DTRACE_PROBES'),
+  'Libvirtd': conf.has('WITH_LIBVIRTD'),
+  'driver_modules': driver_modules_flags.length() > 0,
+  'firewalld': conf.has('WITH_FIREWALLD'),
+  'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'),
+  'nss': conf.has('WITH_NSS'),
+  'numad': conf.has('WITH_NUMAD'),
+  'pm_utils': conf.has('WITH_PM_UTILS'),
+  'virt-host-validate': conf.has('WITH_HOST_VALIDATE'),
+  'virt-login-shell': conf.has('WITH_LOGIN_SHELL'),
+  'wireshark_dissector': wireshark_dep.found(),
 }
-summary(win_summary, section: 'Windows', bool_yn: true)
+summary(feature_summary, section: 'Other features', bool_yn: true)
 
 test_summary = {
+  'Enabled': build_tests,
   'Expensive': use_expensive_tests,
   'Coverage': coverage_flags.length() > 0,
 }
 summary(test_summary, section: 'Test suite', bool_yn: true)
 
-if conf.has('DEFAULT_LOADER_NVRAM')
-  loader_res = '@0@ !!! Using this configure option is strongly discouraged !!!'.format(conf.get_unquoted('DEFAULT_LOADER_NVRAM'))
-else
-  loader_res = ''
-endif
-misc_summary = {
+docs_summary = {
+  'Enabled': gen_docs,
+}
+summary(docs_summary, section: 'Documentation', bool_yn: true)
+
+build_summary = {
   'Warning Flags': supported_cc_flags,
-  'docs': gen_docs,
-  'tests': build_tests,
-  'DTrace': conf.has('WITH_DTRACE_PROBES'),
-  'firewalld': conf.has('WITH_FIREWALLD'),
-  'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'),
-  'nss': conf.has('WITH_NSS'),
-  'numad': conf.has('WITH_NUMAD'),
-  'Init script': init_script,
-  'Char device locks': chrdev_lock_files,
-  'Loader/NVRAM': loader_res,
-  'pm_utils': conf.has('WITH_PM_UTILS'),
-  'virt-login-shell': conf.has('WITH_LOGIN_SHELL'),
-  'virt-host-validate': conf.has('WITH_HOST_VALIDATE'),
-  'TLS priority': conf.get_unquoted('TLS_PRIORITY'),
 }
-summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ')
+summary(build_summary, section: 'Build', bool_yn: true, list_sep: ' ')
 
-devtools_summary = {
-  'wireshark_dissector': wireshark_dep.found(),
+target_summary = {
+  'OS': host_machine.system(),
+  'Init script': init_script,
+  'TLS priority': conf.get_unquoted('TLS_PRIORITY'),
+  'Char device locks': chrdev_lock_files,
 }
-summary(devtools_summary, section: 'Developer Tools', bool_yn: true)
 
+if conf.has('DEFAULT_LOADER_NVRAM')
+  loader_nvram = conf.get_unquoted('DEFAULT_LOADER_NVRAM')
+  loader_nvram_warn = ' !!! configuring loader/NVRAM is strongly discouraged !!!'
+  target_summary += {
+    'Loader/NVRAM': '@0@@1@'.format(loader_nvram, loader_nvram_warn),
+  }
+endif
 if conf.has('WITH_QEMU')
   qemu_warn = ''
   if qemu_user == 'root'
     qemu_warn = ' !!! running QEMU as root is strongly discouraged !!!'
   endif
-  priv_summary = {
-    'QEMU': '@0@:@1@@2@'.format(qemu_user, qemu_group, qemu_warn),
+  target_summary += {
+    'QEMU processes run as': '@0@:@1@@2@'.format(qemu_user, qemu_group, qemu_warn),
   }
-  summary(priv_summary, section: 'Privileges')
 endif
+
+summary(target_summary, section: 'Target', bool_yn: true)
-- 
2.31.1