From c681ccb9c148b60014e7843d6b87f8a6f8a44615 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 27 Jan 2014 23:48:10 +0200 Subject: [PATCH] [PATCH v3] build: write VERSION file containing $(VERSION) string --- 1e/d282f277e150351345ae19f3bed9ffb42c41e9 | 106 ++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 1e/d282f277e150351345ae19f3bed9ffb42c41e9 diff --git a/1e/d282f277e150351345ae19f3bed9ffb42c41e9 b/1e/d282f277e150351345ae19f3bed9ffb42c41e9 new file mode 100644 index 000000000..d7c3c05e8 --- /dev/null +++ b/1e/d282f277e150351345ae19f3bed9ffb42c41e9 @@ -0,0 +1,106 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B4C1F431FBD + for ; Mon, 27 Jan 2014 13:48:23 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 6YkoW0H9ojjX for ; + Mon, 27 Jan 2014 13:48:17 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 6F249431FBC + for ; Mon, 27 Jan 2014 13:48:17 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 2B21410008B; Mon, 27 Jan 2014 23:48:11 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v3] build: write VERSION file containing $(VERSION) string +Date: Mon, 27 Jan 2014 23:48:10 +0200 +Message-Id: <1390859290-10112-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1390858998-9846-1-git-send-email-tomi.ollila@iki.fi> +References: <1390858998-9846-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 27 Jan 2014 21:48:23 -0000 + +This version file will be as prerequisite to the target files +that use the version info for some purpose, like printing +it to the user to examine. The contents of the VERSION file +is seldom read by the build system itself as the $(VERSION) +variable has the same information. +--- + +diffdiff to v2 + +-CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc ++CLEAN := $(CLEAN) VERSION notmuch notmuch-shared $(notmuch_client_modules) + + Makefile.local | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index 174506c..9293ed1 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -21,7 +21,8 @@ endif + VERSION:=$(shell cat ${srcdir}/version) + ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),) + ifeq ($(IS_GIT),yes) +-VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/) ++# Also write VERSION file in case its contents differ from $(VERSION) ++VERSION:=$(shell gv=`exec git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/`; test -f VERSION || touch VERSION; read fv < VERSION; test x"$$fv" = x"$$gv" || echo "$$gv" > VERSION; echo "$$gv") + endif + endif + +@@ -69,6 +70,11 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),) + endif + endif + ++# Depend (also) on 'version' file. In case of ifeq ($(IS_GIT),yes) ++# this file may already have been updated. ++VERSION: version ++ echo $(VERSION) > version ++ + $(TAR_FILE): + if git tag -v $(VERSION) >/dev/null 2>&1; then \ + ref=$(VERSION); \ +@@ -280,6 +286,8 @@ notmuch_client_srcs = \ + + notmuch_client_modules = $(notmuch_client_srcs:.c=.o) + ++notmuch.o: VERSION ++ + notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a + $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ + +@@ -318,7 +326,7 @@ install-desktop: + desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop + + SRCS := $(SRCS) $(notmuch_client_srcs) +-CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc ++CLEAN := $(CLEAN) VERSION notmuch notmuch-shared $(notmuch_client_modules) + + DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config + +-- +1.8.0 + -- 2.26.2