[PATCH v4] build: write VERSION file containing $(VERSION) string

diff --git a/ed/6883a6a0ef5503d572fe9bb45c436063226bf4 b/ed/6883a6a0ef5503d572fe9bb45c436063226bf4
new file mode 100644 (file)
index 0000000..e30ecae
--- /dev/null
+++ b/ed/6883a6a0ef5503d572fe9bb45c436063226bf4
@@ -0,0 +1,114 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1497C431FC2\r
+       for <notmuch@notmuchmail.org>; Wed,  5 Feb 2014 14:58:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id DSat-3xdRI-T for <notmuch@notmuchmail.org>;\r
+       Wed,  5 Feb 2014 14:58:42 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id AB7AB431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  5 Feb 2014 14:58:42 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 9FF3910009D; Thu,  6 Feb 2014 00:58:34 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4] build: write VERSION file containing $(VERSION) string\r
+Date: Thu,  6 Feb 2014 00:58:33 +0200\r
+Message-Id: <1391641113-4669-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <m261p4mkal.fsf@guru.guru-group.fi>\r
+References: <m261p4mkal.fsf@guru.guru-group.fi>\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 05 Feb 2014 22:58:46 -0000\r
+\r
+This version file will be as prerequisite to the target files\r
+that use the version info for some purpose, like printing\r
+it to the user to examine. The contents of the VERSION file\r
+is seldom read by the build system itself as the $(VERSION)\r
+variable has the same information.\r
+---\r
+\r
+ctested also with:\r
+       mv .git .x\r
+       make\r
+       cat VERSION version\r
+       mv .x .git\r
+       make\r
+       cat VERSION version\r
+\r
+ Makefile.local | 17 +++++++++++++++--\r
+ 1 file changed, 15 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 174506c..65c91cb 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -21,7 +21,13 @@ endif\r
+ VERSION:=$(shell cat ${srcdir}/version)\r
+ ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)\r
+ ifeq ($(IS_GIT),yes)\r
+-VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)\r
++# Also write VERSION file in case its contents differ from $(VERSION)\r
++VERSION:=$(shell\\r
++      gv=`git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/`;\\r
++      test -f VERSION || touch VERSION;\\r
++      read fv < VERSION;\\r
++      test x"$$fv" = x"$$gv" || echo "$$gv" > VERSION;\\r
++      echo "$$gv")\r
+ endif\r
+ endif\r
+ \r
+@@ -69,6 +75,11 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)\r
+ endif\r
+ endif\r
+ \r
++# Depend (also) on 'version' file. In case of ifeq ($(IS_GIT),yes)\r
++# this file may already have been updated.\r
++VERSION: version\r
++      echo $(VERSION) > $@\r
++\r
+ $(TAR_FILE):\r
+       if git tag -v $(VERSION) >/dev/null 2>&1; then \\r
+            ref=$(VERSION); \\r
+@@ -280,6 +291,8 @@ notmuch_client_srcs =              \\r
+ \r
+ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)\r
+ \r
++notmuch.o: VERSION\r
++\r
+ notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a\r
+       $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@\r
+ \r
+@@ -318,7 +331,7 @@ install-desktop:\r
+       desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop\r
+ \r
+ SRCS  := $(SRCS) $(notmuch_client_srcs)\r
+-CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc\r
++CLEAN := $(CLEAN) VERSION notmuch notmuch-shared $(notmuch_client_modules)\r
+ \r
+ DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config\r
+ \r
+-- \r
+1.8.4.2\r
+\r