From 069ddc1f9cf2a2e4af2559e97cffafab1179d5fd Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 4 Dec 2013 19:38:59 +0200 Subject: [PATCH] [PATCH 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version checks --- 25/d713624ffcf81fd1043861aa3961e31a9db31b | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 25/d713624ffcf81fd1043861aa3961e31a9db31b diff --git a/25/d713624ffcf81fd1043861aa3961e31a9db31b b/25/d713624ffcf81fd1043861aa3961e31a9db31b new file mode 100644 index 000000000..80d9dcb20 --- /dev/null +++ b/25/d713624ffcf81fd1043861aa3961e31a9db31b @@ -0,0 +1,117 @@ +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 6765C431FD0 + for ; Wed, 4 Dec 2013 09:39:17 -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 YWWn5WH6lmHF for ; + Wed, 4 Dec 2013 09:39:10 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id B9EF6431FC2 + for ; Wed, 4 Dec 2013 09:39:10 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 95B4E1001E5; Wed, 4 Dec 2013 19:39:00 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version + checks +Date: Wed, 4 Dec 2013 19:38:59 +0200 +Message-Id: <1386178739-17475-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu> +References: <1386173986-9624-1-git-send-email-amdragon@mit.edu> +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: Wed, 04 Dec 2013 17:39:17 -0000 + +NOTMUCH_VERSION_* macros in lib/notmuch.h are replaced with +LIBNOTMUCH_VERSION_* macros. Check that the values of those +match the LIBNOTMUCH_*_VERSION values in lib/Makefile.local. +--- + devel/release-checks.sh | 41 ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/devel/release-checks.sh b/devel/release-checks.sh +index d6410ad..7be57df 100755 +--- a/devel/release-checks.sh ++++ b/devel/release-checks.sh +@@ -77,37 +77,36 @@ 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) +-} ++echo -n "Checking that LIBNOTMUCH version macros & variables match ... " ++# lib/notmuch.h ++LIBNOTMUCH_MAJOR_VERSION=broken ++LIBNOTMUCH_MINOR_VERSION=broken ++LIBNOTMUCH_MICRO_VERSION=broken ++# lib/Makefile.local ++LIBNOTMUCH_VERSION_MAJOR=broken ++LIBNOTMUCH_VERSION_MINOR=broken ++LIBNOTMUCH_VERSION_RELEASE=broken ++ ++eval `awk 'NF == 3 && $1 == "#define" && $2 ~ /^LIBNOTMUCH_[A-Z]+_VERSION$/ \ ++ && $3 ~ /^[0-9]+$/ { print $2 "=" $3 }' lib/notmuch.h` + +-IFS=. +-_set_version_components $VERSION +-IFS=$DEFAULT_IFS ++eval `awk 'NF == 3 && $1 ~ /^LIBNOTMUCH_VERSION_[A-Z]+$/ && $2 == "=" \ ++ && $3 ~ /^[0-9]+$/ { print $1 "=" $3 }' lib/Makefile.local` + +-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 ++ eval local v1=\$LIBNOTMUCH_$1_VERSION ++ eval local v2=\$LIBNOTMUCH_VERSION_$2 + if [ $v1 != $v2 ] +- then append_emsg "NOTMUCH_$1_VERSION is defined as '$v2' in lib/notmuch.h instead of '$v1'" ++ then append_emsg "LIBNOTMUCH_$1_VERSION ($v1) does not equal LIBNOTMUCH_VERSION_$2 ($v2)" + fi + } + + old_emsg_count=$emsg_count +-check_version_component MAJOR +-check_version_component MINOR +-check_version_component MICRO ++check_version_component MAJOR MAJOR ++check_version_component MINOR MINOR ++check_version_component MICRO RELEASE + [ $old_emsg_count = $emsg_count ] && echo Yes. || echo No. + + echo -n "Checking that this is Debian package for notmuch... " +-- +1.8.0 + -- 2.26.2