From: Jani Nikula Date: Wed, 4 Dec 2013 18:39:25 +0000 (+0100) Subject: Re: [PATCH 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version checks X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8cf62127a28c33bff385a15f31d8ecbf6342a15;p=notmuch-archives.git Re: [PATCH 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version checks --- diff --git a/ae/0eac367fefe34f6e7c8e109ab9f13125390f6d b/ae/0eac367fefe34f6e7c8e109ab9f13125390f6d new file mode 100644 index 000000000..d08d98b0b --- /dev/null +++ b/ae/0eac367fefe34f6e7c8e109ab9f13125390f6d @@ -0,0 +1,159 @@ +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 1411D431FD2 + for ; Wed, 4 Dec 2013 10:39:52 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 QU2q3O6QhnFT for ; + Wed, 4 Dec 2013 10:39:44 -0800 (PST) +Received: from mail-qa0-f53.google.com (mail-qa0-f53.google.com + [209.85.216.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 798F0431FD0 + for ; Wed, 4 Dec 2013 10:39:44 -0800 (PST) +Received: by mail-qa0-f53.google.com with SMTP id j5so6947871qaq.12 + for ; Wed, 04 Dec 2013 10:39:44 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:in-reply-to:references + :user-agent:date:message-id:mime-version:content-type; + bh=cAc4Hwp1HkVMBMJEogjsBbWkItI990nhTOEZ3/HKWnQ=; + b=R8KtKpRRT8v00ol0o32R6bLcVtM8Yq8SH5qt9zq5zUOSUqHeg7USNgflRkoHcM6CTy + wHScEHkfB3Bqd05XSjm8UM+ZSIStioga4pWMwmDy5eQiWOaRiykuJz+8Zu6ydfHrMVEj + sV6ljBNyl89x8MWcarivnFHMBMBC9WS7TV+GJqPi/I2IW/iG7NJ6OLKS/BCwYysoS/zK + R13Hmb/dsPQrZYif3I5GIkXZu5pE/gIseH5Kd7TtnJMf3krs0FuEWJF0hED2PqJTddRd + 6TnoWKkqzDMU1kz5o6qcLvOnD6i0EykCl6rk1AZCvD2CaAUtl5TxuxUnUF7Klhld7OFl + 36Eg== +X-Gm-Message-State: + ALoCoQlO5OEpZz5fusdEdOvckAlTAs+Y2zpc8axnJS8FPW4g0CKcu5vdGVixzVwNC+Zre29XmirV +X-Received: by 10.224.56.5 with SMTP id w5mr138542104qag.60.1386182383928; + Wed, 04 Dec 2013 10:39:43 -0800 (PST) +Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3]) + by mx.google.com with ESMTPSA id o5sm20182005qeg.2.2013.12.04.10.39.43 + for + (version=TLSv1.1 cipher=RC4-SHA bits=128/128); + Wed, 04 Dec 2013 10:39:43 -0800 (PST) +From: Jani Nikula +To: Tomi Ollila , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/1] devel/release-checks.sh: adjust to LIBNOTMUCH version + checks +In-Reply-To: <1386178739-17475-1-git-send-email-tomi.ollila@iki.fi> +References: <1386173986-9624-1-git-send-email-amdragon@mit.edu> + <1386178739-17475-1-git-send-email-tomi.ollila@iki.fi> +User-Agent: Notmuch/0.17~rc2+4~gd7b0a0a (http://notmuchmail.org) Emacs/23.2.1 + (x86_64-pc-linux-gnu) +Date: Wed, 04 Dec 2013 19:39:25 +0100 +Message-ID: <87r49ssboi.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +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 18:39:52 -0000 + +On Wed, 04 Dec 2013, Tomi Ollila wrote: +> 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 + +Does the test pass if both values are "broken"? Should the other set be +borken? Am I being too pessimistic? :) + +At a glance, the patch looks good, but admittedly didn't spend too much +time on it. + +BR, +Jani. + + +> + +> +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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch