1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 87703429E32
\r
6 for <notmuch@notmuchmail.org>; Mon, 4 Jul 2011 05:04:02 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id FLPg2QDASyoq for <notmuch@notmuchmail.org>;
\r
16 Mon, 4 Jul 2011 05:04:01 -0700 (PDT)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 33ABD429E31
\r
21 for <notmuch@notmuchmail.org>; Mon, 4 Jul 2011 05:04:00 -0700 (PDT)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [142.167.177.149]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p64C3uj6027978
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Mon, 4 Jul 2011 09:03:57 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.76)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Qdhsa-0008Mp-PL; Mon, 04 Jul 2011 09:03:56 -0300
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 4/6] build-system: use signed tag to make tar file,
\r
35 Date: Mon, 4 Jul 2011 09:03:39 -0300
\r
36 Message-Id: <1309781021-32062-5-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.5.4
\r
38 In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net>
\r
39 References: <1309781021-32062-1-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Mon, 04 Jul 2011 12:04:02 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 This as the advantage that "make VERSION=n.m dist" will work correctly
\r
58 even if the wrong branch happens to be checked out.
\r
60 Makefile.local | 8 +++++++-
\r
61 1 files changed, 7 insertions(+), 1 deletions(-)
\r
63 diff --git a/Makefile.local b/Makefile.local
\r
64 index b6445e5..d1c0737 100644
\r
65 --- a/Makefile.local
\r
66 +++ b/Makefile.local
\r
67 @@ -60,7 +60,13 @@ endif
\r
71 - git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp
\r
72 + if git tag -v $(VERSION) >/dev/null 2>&1; then \
\r
76 + echo "Warning: No signed tag for $(VERSION)"; \
\r
78 + git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
\r
79 echo $(VERSION) > version.tmp
\r
80 tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ --transform 's_.tmp$$__' version.tmp
\r