From nobody Wed Nov 5 15:00:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497281987829242.6778145683263; Mon, 12 Jun 2017 08:39:47 -0700 (PDT) Received: from localhost ([::1]:38750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKRRR-0002yn-Jn for importer@patchew.org; Mon, 12 Jun 2017 11:39:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKRQ9-0002Be-UQ for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKRQ7-0007Kv-Qk for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:25 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36186) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dKRQ7-0007KY-Jr for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:23 -0400 Received: by mail-wr0-x243.google.com with SMTP id e23so22871780wre.3 for ; Mon, 12 Jun 2017 08:38:23 -0700 (PDT) Received: from localhost.localdomain (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id e130sm111362wmf.10.2017.06.12.08.38.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2017 08:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GMWdfK5iIR3ei5WpwZ0dhZ6gzF+XlO5SwVCBLbisC/4=; b=jYzPDsnSkw99pPBEhRzzGlAfZH+MSup2US485HXYsn/SPVvGSdLEYI1CiyP5sZWPfI rMwCySXAI5b7gaKC4cKPMM+tFLOiL7RXVrxQXzGZPz9SwTbajRtMMp1Ds6YlvM8eOhFy 4C8pJ3v43xYrV07+N89u3df8chcY8inPtC+3ju6tpkfXdiS9TO9bZeS+AZOV4e7+hc6i 4fM8HtG8/INcP+iU/ARAuLYY5PfR/hGK6X4npwr+7XuGXMJR7ogbfgy1NfSrBtPmjZYl VTY9yBzxewIqwJgYp1Sb/bflnN0i8K8epQNMfOOjBSaUgR/51FvdENvyG80nLNCeqlIK e3iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GMWdfK5iIR3ei5WpwZ0dhZ6gzF+XlO5SwVCBLbisC/4=; b=aS/Wdpa3oPFljQAZzYWwVn1AGlZGFh9XWxI2Q4YF6RaNWOterXmEph1TToywLFzX45 znTpKx24pPENN1TwqUgKY1C4wYAS6rOj2/WNMH9+hNUklP5bP0/bfn1oaAF0IBVo0p40 1LrVB19Wq+sQ+kfRF0GjrhXsxb8VTxGTo4faEADuMejpiKw3fGV4Ho9zVzI685B8SKDF 5v/PHOJS/AJFdvLB9xWmrnyT2sNEOcbo4M/pkXB+7cS/nUeC8qA3ZOOS4v/7N+69uSt7 K0Bl7mA+aIeFNZZVWD5iYrxjP0hBGx8VDGVFgBlxmHllOD2aOqVw6rOtSZcFvreROlfY dYSQ== X-Gm-Message-State: AODbwcCtAPNEvkQ4zCPvE0Zz31BRnoaJr3eLJ0IcUNPBwsU5zJkFKXHn /eqc19JUeZkKooQT1gc= X-Received: by 10.223.155.217 with SMTP id e25mr7764356wrc.55.1497281902309; Mon, 12 Jun 2017 08:38:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 17:38:16 +0200 Message-Id: <20170612153816.15266-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170612153816.15266-1-pbonzini@redhat.com> References: <20170612153816.15266-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH 2/2] qemu-doc: include version number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Note that TEXI2POD doesn't support @set/@clear, so pass the value manually on the command line. This patch partially undoes commit bd7f974796 ("qapi: Clean up build of generated documentation", 2017-03-16). Signed-off-by: Paolo Bonzini --- Makefile | 17 +++++------------ qemu-doc.texi | 5 +++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index c27389af28..b017e3abf8 100644 --- a/Makefile +++ b/Makefile @@ -669,33 +669,26 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ MAKEINFO=3Dmakeinfo MAKEINFOINCLUDES=3D -I docs -I $( $@,"GEN","$@") =20 -%.html: %.texi +%.html: %.texi docs/version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --html $< -o $@,"GEN","$@") =20 -%.info: %.texi +%.info: %.texi docs/version.texi $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") =20 -%.txt: %.texi +%.txt: %.texi docs/version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --plaintext $< -o $@,"GEN","$@") =20 -%.pdf: %.texi +%.pdf: %.texi docs/version.texi $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@") =20 -docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.info \ - docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.pdf \ - docs/interop/qemu-ga-ref.7.pod: docs/version.texi -docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.info \ - docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.pdf \ - docs/interop/qemu-qmp-ref.pod: docs/version.texi - qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@= ") =20 diff --git a/qemu-doc.texi b/qemu-doc.texi index 965ba5929e..21079fd675 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -1,11 +1,12 @@ \input texinfo @c -*- texinfo -*- @c %**start of header @setfilename qemu-doc.info +@include version.texi =20 @documentlanguage en @documentencoding UTF-8 =20 -@settitle QEMU Emulator User Documentation +@settitle QEMU version @value{VERSION} User Documentation @exampleindent 0 @paragraphindent 0 @c %**end of header @@ -19,7 +20,7 @@ @iftex @titlepage @sp 7 -@center @titlefont{QEMU Emulator} +@center @titlefont{QEMU version @value{VERSION}} @sp 1 @center @titlefont{User Documentation} @sp 3 --=20 2.13.0