[PATCH v2 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version checks

diff --git a/45/eb1aeb2dbd1bfa5512ab9485a31351b686e3d4 b/45/eb1aeb2dbd1bfa5512ab9485a31351b686e3d4
new file mode 100644 (file)
index 0000000..3e3163d
--- /dev/null
+++ b/45/eb1aeb2dbd1bfa5512ab9485a31351b686e3d4
@@ -0,0 +1,120 @@
+Return-Path: <too@guru-group.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 6E177431FDA\r
+       for <notmuch@notmuchmail.org>; Wed,  4 Dec 2013 11:32:11 -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 H843bBeCJyjI for <notmuch@notmuchmail.org>;\r
+       Wed,  4 Dec 2013 11:32:05 -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 C623D431FD0\r
+       for <notmuch@notmuchmail.org>; Wed,  4 Dec 2013 11:32:04 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 7A1E81001E5; Wed,  4 Dec 2013 21:32:00 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version\r
+       checks\r
+Date: Wed,  4 Dec 2013 21:31:58 +0200\r
+Message-Id: <1386185518-19245-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <id:1386173986-9624-1-git-send-email-amdragon@mit.edu>\r
+References: <id:1386173986-9624-1-git-send-email-amdragon@mit.edu>\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: Wed, 04 Dec 2013 19:32:11 -0000\r
+\r
+NOTMUCH_VERSION_* macros in lib/notmuch.h are replaced with\r
+LIBNOTMUCH_VERSION_* macros. Check that the values of those\r
+match the LIBNOTMUCH_*_VERSION values in lib/Makefile.local.\r
+---\r
+\r
+edited patch file, reapplied and checked results. resent.\r
+\r
+ devel/release-checks.sh | 41 ++++++++++++++++++++---------------------\r
+ 1 file changed, 20 insertions(+), 21 deletions(-)\r
+\r
+diff --git a/devel/release-checks.sh b/devel/release-checks.sh\r
+index d6410ad..7be57df 100755\r
+--- a/devel/release-checks.sh\r
++++ b/devel/release-checks.sh\r
+@@ -77,37 +77,36 @@ case $VERSION in\r
+       *)      verfail "'$VERSION' is a single number" ;;\r
+ esac\r
+ \r
+-_set_version_components ()\r
+-{\r
+-      VERSION_MAJOR=$1\r
+-      VERSION_MINOR=$2\r
+-      VERSION_MICRO=${3:-0} # set to 0 in case $3 is unset or "null" (string)\r
+-}\r
++echo -n "Checking that LIBNOTMUCH version macros & variables match ... "\r
++# lib/notmuch.h\r
++LIBNOTMUCH_MAJOR_VERSION=broken\r
++LIBNOTMUCH_MINOR_VERSION=broken\r
++LIBNOTMUCH_MICRO_VERSION=broken\r
++# lib/Makefile.local\r
++LIBNOTMUCH_VERSION_MAJOR=borken\r
++LIBNOTMUCH_VERSION_MINOR=borken\r
++LIBNOTMUCH_VERSION_RELEASE=borken\r
++\r
++eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^LIBNOTMUCH_[A-Z]+_VERSION$/ \\r
++      && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h`\r
+ \r
+-IFS=.\r
+-_set_version_components $VERSION\r
+-IFS=$DEFAULT_IFS\r
++eval `awk 'NF == 3 && $1 ~ /^LIBNOTMUCH_VERSION_[A-Z]+$/ && $2 == "=" \\r
++      && $3 ~ /^[0-9]+$/ { print $1 "=" $3 }' lib/Makefile.local`\r
+ \r
+-echo -n "Checking that libnotmuch version macros match $VERSION... "\r
+-NOTMUCH_MAJOR_VERSION=broken\r
+-NOTMUCH_MINOR_VERSION=broken\r
+-NOTMUCH_MICRO_VERSION=broken\r
+-eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^NOTMUCH_[A-Z]+_VERSION$/ \\r
+-      && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h`\r
+ \r
+ check_version_component ()\r
+ {\r
+-      eval local v1=\$VERSION_$1\r
+-      eval local v2=\$NOTMUCH_$1_VERSION\r
++      eval local v1=\$LIBNOTMUCH_$1_VERSION\r
++      eval local v2=\$LIBNOTMUCH_VERSION_$2\r
+       if [ $v1 != $v2 ]\r
+-      then    append_emsg "NOTMUCH_$1_VERSION is defined as '$v2' in lib/notmuch.h instead of '$v1'"\r
++      then    append_emsg "LIBNOTMUCH_$1_VERSION ($v1) does not equal LIBNOTMUCH_VERSION_$2 ($v2)"\r
+       fi\r
+ }\r
+ \r
+ old_emsg_count=$emsg_count\r
+-check_version_component MAJOR\r
+-check_version_component MINOR\r
+-check_version_component MICRO\r
++check_version_component MAJOR MAJOR\r
++check_version_component MINOR MINOR\r
++check_version_component MICRO RELEASE\r
+ [ $old_emsg_count = $emsg_count ] && echo Yes. || echo No.\r
+ \r
+ echo -n "Checking that this is Debian package for notmuch... "\r
+-- \r
+1.8.0\r
+\r