From nobody Sun Nov 10 22:32:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551972688007479.43833462376654; Thu, 7 Mar 2019 07:31:28 -0800 (PST) Received: from localhost ([127.0.0.1]:53877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uzV-00087A-0E for importer@patchew.org; Thu, 07 Mar 2019 10:31:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1utN-0002hS-N1 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 10:25:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1utM-0004v4-T3 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 10:25:05 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:42077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1utM-0004uJ-Mm for qemu-devel@nongnu.org; Thu, 07 Mar 2019 10:25:04 -0500 Received: by mail-wr1-x431.google.com with SMTP id r5so17898443wrg.9 for ; Thu, 07 Mar 2019 07:25:04 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d1sm5338345wrs.13.2019.03.07.07.25.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 07:25:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OnTS4raxef201aydXcnSAQ24k82s5wx58EGznEvtEAc=; b=gDOfOW+mpWzfnZm1naoZSKAWXiYtKhH6lVJkgoKOLS+immEtLJSGPTUx5GVVI5DY4C M+sx9beQda3U29+/YF4r6tuyXy5MncJCplp/pMdsPNRKYXQT3Sa6f441turGEAlNReWa JHlfn36JCXQpfqiOFDZyEbvom5CL2nKf8k/U21qxvuBkdZ+S3cWqNz/H+epUm/5A2zDg 32xcjCPAcWc42BoqSw/KIrEgKxeMCBkIX9Ycqi8+HQnSxt9SIAzOc74R6BNFQd04WGVI r+pbF06i7VPHYd6TUYdf5FjPwtio0RGA/kT6nuLu6MOO+MYucrRnn+N6CsZ3csYpzWBD KWsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OnTS4raxef201aydXcnSAQ24k82s5wx58EGznEvtEAc=; b=MrxXs0QpzhoufCN7JCwWCOvMhioQfNxtXcubXHffnq4KZeigw/s0jw3/GjSnqJMYuG LobPRO0FkrbRCb6JrNSZJ+cQfx4LosJzS/Nb/DuMM8n6k4zupZIZCeYjIz7cdL+1eYCF 3TskX55DWqxPFp3z70a7W9cHBiVHEbHZxCvZcwXN2DoykLtKsk1ZA0pium+JmyW3oRF4 AOexX8vp5xgEFuZEICpkwdGbi6IWaNpSmaPQt5LHrVenNmtW0Eo/TZmAAXHrwFw8KjCp cyDFkbE/LrMC2TvwJ1HooAHr9Bm5eigBH/IUbT0Xyk8Z4SG5VwYG/8UEQVOduQvPtIwZ fxzg== X-Gm-Message-State: APjAAAVAVlHpdGiDilcUVJiUVUOukRnQzQuls2f1U5XKU9kVZ1PQ2DkT ViFFwu2aiLsGjbuBx5t8yWTQR5dlw+Y= X-Google-Smtp-Source: APXvYqypWyaHQmTParvtMNfhiyE4qcVvpUcB93a1iktEL0dqc9k9d+QwHQBep3+Jse+quBa54+vD7w== X-Received: by 2002:adf:dfca:: with SMTP id q10mr7471748wrn.45.1551972303437; Thu, 07 Mar 2019 07:25:03 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:24:48 +0000 Message-Id: <20190307152450.20340-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307152450.20340-1-peter.maydell@linaro.org> References: <20190307152450.20340-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PULL 10/12] Makefile: Abstract out "identify the pkgversion" code 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Abstract out the "identify the pkgversion" code from the rule for creating qemu-version.h, so it sets makefile variables for QEMU_PKGVERSION and QEMU_FULL_VERSION. (We will want to use these when building the Sphinx docs.) NB: As we abstract this out, we use -e to check for .git rather than -d, since in some situations .git may be a file rather than a directory. Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Acked-by: Aleksandar Markovic Reviewed-by: Richard Henderson Message-id: 20190305172139.32662-11-peter.maydell@linaro.org Message-id: 20190228145624.24885-11-peter.maydell@linaro.org --- Makefile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index add22cf2947..b746d112a7f 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,20 @@ endif =20 include $(SRC_PATH)/rules.mak =20 +# Create QEMU_PKGVERSION and FULL_VERSION strings +# If PKGVERSION is set, use that; otherwise get version and -dirty status = from git +QEMU_PKGVERSION :=3D $(if $(PKGVERSION),$(PKGVERSION),$(shell \ + cd $(SRC_PATH); \ + if test -e .git; then \ + git describe --match 'v*' 2>/dev/null | tr -d '\n'; \ + if ! git diff-index --quiet HEAD &>/dev/null; then \ + echo "-dirty"; \ + fi; \ + fi)) + +# Either "version (pkgversion)", or just "version" if pkgversion not set +FULL_VERSION :=3D $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),= $(VERSION)) + GENERATED_FILES =3D qemu-version.h config-host.h qemu-options.def =20 GENERATED_QAPI_FILES =3D qapi/qapi-builtin-types.h qapi/qapi-builtin-types= .c @@ -392,23 +406,8 @@ all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $= (HELPERS-y) recurse-all mo =20 qemu-version.h: FORCE $(call quiet-command, \ - (cd $(SRC_PATH); \ - if test -n "$(PKGVERSION)"; then \ - pkgvers=3D"$(PKGVERSION)"; \ - else \ - if test -d .git; then \ - pkgvers=3D$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\ - if ! git diff-index --quiet HEAD &>/dev/null; then \ - pkgvers=3D"$${pkgvers}-dirty"; \ - fi; \ - fi; \ - fi; \ - printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \ - if test -n "$${pkgvers}"; then \ - printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"= \n'; \ - else \ - printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \ - fi; \ + (printf '#define QEMU_PKGVERSION "$(QEMU_PKGVERSION)"\n'; \ + printf '#define QEMU_FULL_VERSION "$(FULL_VERSION)"\n'; \ ) > $@.tmp) $(call quiet-command, if ! cmp -s $@ $@.tmp; then \ mv $@.tmp $@; \ --=20 2.20.1