1 Return-Path: <too@guru-group.fi>
\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 6E177431FDA
\r
6 for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 11:32:11 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 H843bBeCJyjI for <notmuch@notmuchmail.org>;
\r
16 Wed, 4 Dec 2013 11:32:05 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id C623D431FD0
\r
19 for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 11:32:04 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 7A1E81001E5; Wed, 4 Dec 2013 21:32:00 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: notmuch@notmuchmail.org
\r
24 Subject: [PATCH v2 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version
\r
26 Date: Wed, 4 Dec 2013 21:31:58 +0200
\r
27 Message-Id: <1386185518-19245-1-git-send-email-tomi.ollila@iki.fi>
\r
28 X-Mailer: git-send-email 1.8.0
\r
29 In-Reply-To: <id:1386173986-9624-1-git-send-email-amdragon@mit.edu>
\r
30 References: <id:1386173986-9624-1-git-send-email-amdragon@mit.edu>
\r
31 Cc: tomi.ollila@iki.fi
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Wed, 04 Dec 2013 19:32:11 -0000
\r
46 NOTMUCH_VERSION_* macros in lib/notmuch.h are replaced with
\r
47 LIBNOTMUCH_VERSION_* macros. Check that the values of those
\r
48 match the LIBNOTMUCH_*_VERSION values in lib/Makefile.local.
\r
51 edited patch file, reapplied and checked results. resent.
\r
53 devel/release-checks.sh | 41 ++++++++++++++++++++---------------------
\r
54 1 file changed, 20 insertions(+), 21 deletions(-)
\r
56 diff --git a/devel/release-checks.sh b/devel/release-checks.sh
\r
57 index d6410ad..7be57df 100755
\r
58 --- a/devel/release-checks.sh
\r
59 +++ b/devel/release-checks.sh
\r
60 @@ -77,37 +77,36 @@ case $VERSION in
\r
61 *) verfail "'$VERSION' is a single number" ;;
\r
64 -_set_version_components ()
\r
68 - VERSION_MICRO=${3:-0} # set to 0 in case $3 is unset or "null" (string)
\r
70 +echo -n "Checking that LIBNOTMUCH version macros & variables match ... "
\r
72 +LIBNOTMUCH_MAJOR_VERSION=broken
\r
73 +LIBNOTMUCH_MINOR_VERSION=broken
\r
74 +LIBNOTMUCH_MICRO_VERSION=broken
\r
75 +# lib/Makefile.local
\r
76 +LIBNOTMUCH_VERSION_MAJOR=borken
\r
77 +LIBNOTMUCH_VERSION_MINOR=borken
\r
78 +LIBNOTMUCH_VERSION_RELEASE=borken
\r
80 +eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^LIBNOTMUCH_[A-Z]+_VERSION$/ \
\r
81 + && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h`
\r
84 -_set_version_components $VERSION
\r
86 +eval `awk 'NF == 3 && $1 ~ /^LIBNOTMUCH_VERSION_[A-Z]+$/ && $2 == "=" \
\r
87 + && $3 ~ /^[0-9]+$/ { print $1 "=" $3 }' lib/Makefile.local`
\r
89 -echo -n "Checking that libnotmuch version macros match $VERSION... "
\r
90 -NOTMUCH_MAJOR_VERSION=broken
\r
91 -NOTMUCH_MINOR_VERSION=broken
\r
92 -NOTMUCH_MICRO_VERSION=broken
\r
93 -eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^NOTMUCH_[A-Z]+_VERSION$/ \
\r
94 - && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h`
\r
96 check_version_component ()
\r
98 - eval local v1=\$VERSION_$1
\r
99 - eval local v2=\$NOTMUCH_$1_VERSION
\r
100 + eval local v1=\$LIBNOTMUCH_$1_VERSION
\r
101 + eval local v2=\$LIBNOTMUCH_VERSION_$2
\r
103 - then append_emsg "NOTMUCH_$1_VERSION is defined as '$v2' in lib/notmuch.h instead of '$v1'"
\r
104 + then append_emsg "LIBNOTMUCH_$1_VERSION ($v1) does not equal LIBNOTMUCH_VERSION_$2 ($v2)"
\r
108 old_emsg_count=$emsg_count
\r
109 -check_version_component MAJOR
\r
110 -check_version_component MINOR
\r
111 -check_version_component MICRO
\r
112 +check_version_component MAJOR MAJOR
\r
113 +check_version_component MINOR MINOR
\r
114 +check_version_component MICRO RELEASE
\r
115 [ $old_emsg_count = $emsg_count ] && echo Yes. || echo No.
\r
117 echo -n "Checking that this is Debian package for notmuch... "
\r