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

diff --git a/21/0073051dc88b5f204444a5d6d8c4d175c98418 b/21/0073051dc88b5f204444a5d6d8c4d175c98418
new file mode 100644 (file)
index 0000000..0366b27
--- /dev/null
+++ b/21/0073051dc88b5f204444a5d6d8c4d175c98418
@@ -0,0 +1,103 @@
+Return-Path: <tomi.ollila@iki.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 2002A431FBD\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Feb 2014 00:27:06 -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 mo8Q+9MFyKFf for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Feb 2014 00:26:58 -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 B2D0A431FBC\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Feb 2014 00:26:58 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id C48031000B2;\r
+       Sun,  9 Feb 2014 10:26:50 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: "W. Trevor King" <wking@tremily.us>\r
+Subject: Re: [PATCH v4] build: write VERSION file containing $(VERSION) string\r
+In-Reply-To: <20140208235623.GF17142@odin.tremily.us>\r
+References: <m261p4mkal.fsf@guru.guru-group.fi>\r
+       <1391641113-4669-1-git-send-email-tomi.ollila@iki.fi>\r
+       <20140208235623.GF17142@odin.tremily.us>\r
+User-Agent: Notmuch/0.17+69~g761b031 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 09 Feb 2014 10:26:50 +0200\r
+Message-ID: <m2eh3czo6t.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+Cc: notmuch@notmuchmail.org\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, 09 Feb 2014 08:27:06 -0000\r
+\r
+On Sun, Feb 09 2014, "W. Trevor King" <wking@tremily.us> wrote:\r
+\r
+> On Thu, Feb 06, 2014 at 12:58:33AM +0200, Tomi Ollila wrote:\r
+>> -VERSION:=3D$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/=\r
++/ -e s/-/~/)\r
+>> +# Also write VERSION file in case its contents differ from $(VERSION)\r
+>> +VERSION:=3D$(shell\\r
+>> +   gv=3D`git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/=\r
+`;\\r
+>\r
+> Ew, backticks ;).  What about handling more of the logic in Make:\r
+>\r
+>   VERSION :=3D $(shell git describe =E2=80=A6)\r
+>   FILE_VERSION :=3D $(shell test -f VERSION || touch VERSION; cat VERSION)\r
+>   ifneq ($(FILE_VERSION), $(VERSION))\r
+>      $(shell echo "$(VERSION)" > VERSION)\r
+>   endif\r
+\r
+Sure makes that clearer...\r
+\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
+> Do we care about case-insensitive filesystems where VERSION will\r
+> collide with version?\r
+\r
+Very good point! We do not wan't to have a chance to overwrite version\r
+... I have to look a new filename for that...\r
+\r
+>\r
+>> -CLEAN :=3D $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) no=\r
+tmuch.elc\r
+>> +CLEAN :=3D $(CLEAN) VERSION notmuch notmuch-shared $(notmuch_client_mod=\r
+ules)\r
+>\r
+> Where did notmuch.elc go?\r
+\r
+To emacs/notmuch.elc years ago.\r
+\r
+>\r
+> Cheers,\r
+> Trevor\r
+\r
+Thanks for review.\r
+\r
+Tomi\r