From 2793f47c066ed396b38893c10533202fceb1a05f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 17 Sep 2020 13:28:19 -0400 Subject: [PATCH] build: Build and install a Texinfo version of the manual. Take advantage of the Sphinx texinfo backend to generate a QEMU info manual. The Texinfo format allows for more structure and info readers provide more advanced navigation capabilities compared to manpages readers. * docs/meson.build (texi, info): New targets. Signed-off-by: Maxim Cournoyer diff --git a/docs/meson.build b/docs/meson.build --- a/docs/meson.build +++ b/docs/meson.build @@ -92,4 +92,25 @@ if build_docs alias_target('sphinxdocs', sphinxdocs) alias_target('html', sphinxdocs) alias_target('man', sphinxmans) + + # Generate a Texinfo version of the QEMU manual. + makeinfo = find_program(['texi2any', 'makeinfo']) + if makeinfo.found() + sphinxtexi = custom_target( + 'QEMU manual generated texinfo source', + output: ['QEMU.texi', 'sphinxtexi.stamp'], + depfile: 'sphinxtexi.d', + command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', + '-Ddepfile_stamp=@OUTPUT1@', '-b', 'texinfo', + meson.current_source_dir(), meson.current_build_dir()]) + sphinxinfo = custom_target( + 'QEMU info manual', + input: sphinxtexi, + output: 'QEMU.info', + install: true, + install_dir: get_option('infodir'), + command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@']) + alias_target('texi', sphinxtexi) + alias_target('info', sphinxinfo) + endif endif diff --git a/meson.build b/meson.build --- a/meson.build +++ b/meson.build @@ -37,6 +37,7 @@ endif qemu_confdir = get_option('sysconfdir') / get_option('qemu_suffix') qemu_datadir = get_option('datadir') / get_option('qemu_suffix') qemu_docdir = get_option('docdir') / get_option('qemu_suffix') +qemu_infodir = get_option('infodir') / get_option('qemu_suffix') qemu_moddir = get_option('libdir') / get_option('qemu_suffix') qemu_desktopdir = get_option('datadir') / 'applications' @@ -3698,6 +3699,7 @@ else summary_info += {'local state directory': 'queried at runtime'} endif summary_info += {'Doc directory': get_option('prefix') / get_option('docdir')} +summary_info += {'Info directory': get_option('prefix') / get_option('infodir')} summary_info += {'Build directory': meson.current_build_dir()} summary_info += {'Source path': meson.current_source_dir()} summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']} ;showmsg=1'>Expand)Author 2024-08-31gnu: Remove unneeded libxml2 from native-inputs. (libxslt)...XML_CATALOG_FILES is already set within libxslt so it's unnecessary to include libxml2 for the same effect. * gnu/packages/freedesktop.scm (wayland): Remove obsolete comment. (farstream, elogind, packagekit, accountsservice, plymouth)[native-inputs]: Remove libxml2. * gnu/packages/benchmark.scm (sysbench)[native-inputs]: Ditto. * gnu/packages/cluster.scm (drbd-utils)[native-inputs]: Ditto. * gnu/packages/glib.scm (dbus)[native-inputs]: Ditto. * gnu/packages/gnome.scm (gnome-keyring, glade3, dconf, libsecret, colord) (upower, gnome-settings-daemon)[native-inputs]: Ditto. * gnu/packages/linux.scm (eudev)[native-inputs]: Ditto. * gnu/packages/networking.scm (iputils)[native-inputs]: Ditto. * gnu/packages/ocr.scm (tesseract-ocr)[native-inputs]: Ditto. * gnu/packages/polkit.scm (polkit)[native-inputs]: Ditto. * gnu/packages/samba.scm (samba/pinned)[native-inputs]: Ditto. * gnu/packages/sssd.scm (adcli)[native-inputs]: Ditto. * gnu/packages/terminals.scm (kmscon)[native-inputs]: Ditto. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: Ica3fb5a8e23ad928c53ae508c02777d78c635af0 Bruno Victal 2024-08-31gnu: sssd: Drop xmllint workaround....* gnu/packages/sssd.scm (sssd)[arguments]<#:make-flags>: Drop XMLLINT_FLAGS. [native-inputs]: Add docbook-xml-4.4. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Bruno Victal