--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 15FDC431FBD\r
+ for <notmuch@notmuchmail.org>; Sun, 26 Jan 2014 11:58:15 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 ORnaaEApaEfC for <notmuch@notmuchmail.org>;\r
+ Sun, 26 Jan 2014 11:58:07 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 50BE9431FBC\r
+ for <notmuch@notmuchmail.org>; Sun, 26 Jan 2014 11:58:07 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1W7VqC-0002c4-2g; Sun, 26 Jan 2014 19:58:05 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1W7Vp3-0004aN-LL; Sun, 26 Jan 2014 19:56:49 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] build: write VERSION file containing $(VERSION)\r
+ string\r
+In-Reply-To: <1390689800-16654-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1390689800-16654-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 26 Jan 2014 19:55:08 +0000\r
+Message-ID: <87wqhm8qn7.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: c23e237f691b26f710ce5f7bc11d8048 (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored 0.0 points. Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sun, 26 Jan 2014 19:58:15 -0000\r
+\r
+\r
+Hi\r
+\r
+I experimented with this and it didn't always seem to rebuild VERSION\r
+when it should. Looking at the file .git/HEAD that just seems to be the\r
+branch name not the commit id (unless in detached HEAD state)\r
+\r
+This link\r
+http://stackoverflow.com/questions/6526451/how-to-include-git-commit-number-into-a-c-executable \r
+suggests adding .git/index to the VERSION depends.\r
+\r
+I tested that and that does seem to work. It may mean that VERSION gets\r
+rebuilt if you stash (for example) but that is probably not a big\r
+problem.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Sat, 25 Jan 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:\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
+> Makefile.local | 11 ++++++++++-\r
+> 1 file changed, 10 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/Makefile.local b/Makefile.local\r
+> index c85e09c..1f876b3 100644\r
+> --- a/Makefile.local\r
+> +++ b/Makefile.local\r
+> @@ -22,6 +22,8 @@ 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
+> +# Make the 'VERSION' file depend *also* on .git/HEAD in this case\r
+> +VERSION: .git/HEAD\r
+> endif\r
+> endif\r
+> \r
+> @@ -69,6 +71,11 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)\r
+> endif\r
+> endif\r
+> \r
+> +# This VERSION file is used mostly for triggering other file remakes...\r
+> +# This may get other dependency to .git/HEAD above in this file.\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 +287,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 +327,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.5.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff