Re: [PATCH] build: check .git directory existence in srcdir (for out-of-tree builds)

diff --git a/0d/a0be1695184081fa8c50183ff71109b3d0648c b/0d/a0be1695184081fa8c50183ff71109b3d0648c
new file mode 100644 (file)
index 0000000..60723b1
--- /dev/null
+++ b/0d/a0be1695184081fa8c50183ff71109b3d0648c
@@ -0,0 +1,90 @@
+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 AA64A431FBD\r
+       for <notmuch@notmuchmail.org>; Sun,  6 Jul 2014 12:50:43 -0700 (PDT)\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 abej6oNs7c5Q for <notmuch@notmuchmail.org>;\r
+       Sun,  6 Jul 2014 12:50:35 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9EAF0431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  6 Jul 2014 12:50:35 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 289DB10008F;\r
+       Sun,  6 Jul 2014 22:50:26 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] build: check .git directory existence in srcdir (for\r
+       out-of-tree builds)\r
+In-Reply-To: <874mywroni.fsf@maritornes.cs.unb.ca>\r
+References: <1399404928-15471-1-git-send-email-tomi.ollila@iki.fi>\r
+       <874mywroni.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.18.1+25~gdaf4b6f (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, 06 Jul 2014 22:50:25 +0300\r
+Message-ID: <m2fvieferi.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 06 Jul 2014 19:50:43 -0000\r
+\r
+On Sat, Jul 05 2014, David Bremner <david@tethera.net> wrote:\r
+\r
+> Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+>\r
+>> So that $(VERSION) and version.stamp uses the git-describe -based\r
+>> version data instead of the content of `version' file.\r
+>>\r
+>> For consistency also the git commands in Makefile[.local] target\r
+>> `verify-no-dirty-code' uses the git --git-dir=$srcdir/.git ...\r
+>> commands (inside ifeq($(IS_GIT),yes)). Attempting to make this\r
+>> target outside of the tree will fail in any case.\r
+>\r
+> This seems to work OK; I wondered if an alternate method of setting (and\r
+> exporting) GIT_DIR from the top level makefile would work as well, and\r
+> be less intrusive?\r
+\r
+This looked like a good idea, and I tested it. But -- lo and behold --\r
+the environment variables set in Makefile do not probagate to the\r
+commands executed with $(shell ...) -- see (*) (I wrapped git(1) in a shell\r
+script (executes env then execs real git) to verify this is still the case).\r
+\r
+I thoght now a bit whether we'd use variable in place of ${srcdir}/.git\r
+but IMHO is better in this way:\r
+\r
+   - make does not have option to warn/die in case variable undefined,\r
+     it is then just empty string so no internal error checking there\r
+\r
+   - any human observer notices from the ${srcdir}/.git that we're not\r
+     using git from any nonstandard place -- if there were variable one\r
+     would have needed to dereference that to figure out this is the case.\r
+\r
+(*) http://www.cmcrossroads.com/article/basics-getting-environment-variables-gnu-make?page=0%2C1\r
+\r
+>\r
+> d\r
+\r
+\r
+Tomi\r