Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id AD85C431FD8 for ; Fri, 8 Nov 2013 09:31:11 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cn9-qdbcTzsX for ; Fri, 8 Nov 2013 09:31:05 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 0F68A431FC9 for ; Fri, 8 Nov 2013 09:31:05 -0800 (PST) Received: by guru.guru-group.fi (Postfix, from userid 501) id 03BB41000E0; Fri, 8 Nov 2013 19:30:59 +0200 (EET) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH 1/1] devel/release-checks.sh: check NOTMUCH_(MAJOR|MINOR|MICRO)_VERSION Date: Fri, 8 Nov 2013 19:30:56 +0200 Message-Id: <1383931856-5377-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.8.0 Cc: tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 17:31:11 -0000 New defines NOTMUCH_MAJOR_VERSION, NOTMUCH_MINOR_VERSION and NOTMUCH_MICRO_VERSION were added to lib/notmuch.h. Check that these match the current value defined in ./version. --- devel/release-checks.sh | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/devel/release-checks.sh b/devel/release-checks.sh index 4eff1a7..d6410ad 100755 --- a/devel/release-checks.sh +++ b/devel/release-checks.sh @@ -13,6 +13,8 @@ fi set -o posix set -o pipefail # bash feature +readonly DEFAULT_IFS="$IFS" # Note: In this particular case quotes are needed. + # Avoid locale-specific differences in output of executed commands LANG=C LC_ALL=C; export LANG LC_ALL @@ -20,8 +22,10 @@ readonly PV_FILE='bindings/python/notmuch/version.py' # Using array here turned out to be unnecessarily complicated emsgs='' +emsg_count=0 append_emsg () { + emsg_count=$((emsg_count + 1)) emsgs="${emsgs:+$emsgs\n} $1" } @@ -73,6 +77,38 @@ case $VERSION in *) verfail "'$VERSION' is a single number" ;; esac +_set_version_components () +{ + VERSION_MAJOR=$1 + VERSION_MINOR=$2 + VERSION_MICRO=${3:-0} # set to 0 in case $3 is unset or "null" (string) +} + +IFS=. +_set_version_components $VERSION +IFS=$DEFAULT_IFS + +echo -n "Checking that libnotmuch version macros match $VERSION... " +NOTMUCH_MAJOR_VERSION=broken +NOTMUCH_MINOR_VERSION=broken +NOTMUCH_MICRO_VERSION=broken +eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^NOTMUCH_[A-Z]+_VERSION$/ \ + && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h` + +check_version_component () +{ + eval local v1=\$VERSION_$1 + eval local v2=\$NOTMUCH_$1_VERSION + if [ $v1 != $v2 ] + then append_emsg "NOTMUCH_$1_VERSION is defined as '$v2' in lib/notmuch.h instead of '$v1'" + fi +} + +old_emsg_count=$emsg_count +check_version_component MAJOR +check_version_component MINOR +check_version_component MICRO +[ $old_emsg_count = $emsg_count ] && echo Yes. || echo No. echo -n "Checking that this is Debian package for notmuch... " read deb_notmuch deb_version rest < debian/changelog -- 1.8.0