Return-Path: <jani@nikula.org>
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 E60F5431FD2
	for <notmuch@notmuchmail.org>; Wed,  4 Dec 2013 10:36:59 -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 zvvjqHUeuYKL for <notmuch@notmuchmail.org>;
	Wed,  4 Dec 2013 10:36:53 -0800 (PST)
Received: from mail-qa0-f49.google.com (mail-qa0-f49.google.com
	[209.85.216.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id A412F431FD0
	for <notmuch@notmuchmail.org>; Wed,  4 Dec 2013 10:36:53 -0800 (PST)
Received: by mail-qa0-f49.google.com with SMTP id ii20so6967965qab.1
	for <notmuch@notmuchmail.org>; Wed, 04 Dec 2013 10:36:51 -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=D9pMdkRg5dqzwVZkHgPAvbPHeE91jBcSr20D80Mi6iM=;
	b=jgFbKrv9vEaHCQwD709PsJhedIina2AfDngyCjcT4SuA67cPcEWR+pvb0BMYixy8y3
	YvzMw9CDOU3VrwxYywgT5UIRwsyRsPd8FjTHJ2Qfvup19qXeVeveYCnYd4GNvAa0hv4o
	YaiRZdEtu0FYUz+E2+Sdtu2KpDgv6uPuRruKVWFMs/EFH9+7cwhhG/eptDFyqcB6KpUR
	VqdMKWMDTVGoCbS9G2U+Ete6FS+STzMG7c2Ts2+Mmjfs7oPtcWXudguN3eeT6CO+SISW
	mCsP8d3iyo4z/5ZBv6z+cKZr1OYlxJRgTtb6aSOIDbgG6LZVAembih5oI24XhD2sHTSR
	vFHQ==
X-Gm-Message-State:
 ALoCoQmic1Z4Oi8NNg/N3dw3IkTMNq82ESgC+SLLWCvkNlSIeFf+HZ7DFRjekfTGSMsfr7a1OE9j
X-Received: by 10.49.15.227 with SMTP id a3mr111501189qed.66.1386182211832;
	Wed, 04 Dec 2013 10:36:51 -0800 (PST)
Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])
	by mx.google.com with ESMTPSA id b4sm43197867qai.7.2013.12.04.10.36.50
	for <multiple recipients>
	(version=TLSv1.1 cipher=RC4-SHA bits=128/128);
	Wed, 04 Dec 2013 10:36:51 -0800 (PST)
From: Jani Nikula <jani@nikula.org>
To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
Subject: Re: [PATCH 1/3] lib: Make VERSION macros agree with soname version
In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu>
References: <1386173986-9624-1-git-send-email-amdragon@mit.edu>
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:36:33 +0100
Message-ID: <87txeosbta.fsf@nikula.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Dec 2013 18:37:00 -0000

On Wed, 04 Dec 2013, Austin Clements <amdragon@MIT.EDU> wrote:
> We have two distinct "library version" numbers: the soname version and
> the version macros.  We need both for different reasons: the version
> macros enable easy compile-time version detection (and conditional
> compilation), while the soname version enables runtime version
> detection (which includes the version checking done by things like the
> Python bindings).
>
> However, currently, these two version numbers are different, which is
> unnecessary and can lead to confusion (especially in things like
> Debian, which include the soname version in the package name).  This
> patch makes them the same by bumping the version macros up to agree
> with the soname version.

The patches look good to me. Thanks for spotting and fixing this in the
nick of time before releasing.

BR,
Jani.


>
> (We should probably keep the version number in just one place so they
> can't get out of sync, but that can be done in another patch.)
> ---
>  lib/Makefile.local | 3 +++
>  lib/notmuch.h      | 8 ++++++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/lib/Makefile.local b/lib/Makefile.local
> index 155ac02..cd2c60d 100644
> --- a/lib/Makefile.local
> +++ b/lib/Makefile.local
> @@ -18,6 +18,9 @@ LIBNOTMUCH_VERSION_MINOR = 0
>  # simply compatible changes to the implementation).
>  LIBNOTMUCH_VERSION_RELEASE = 0
>  
> +# Note: Don't forget to change the VERSION macros in notmuch.h when
> +# any of the above change.
> +
>  ifeq ($(PLATFORM),MACOSX)
>  LIBRARY_SUFFIX = dylib
>  # On OS X, library version numbers go before suffix.
> diff --git a/lib/notmuch.h b/lib/notmuch.h
> index 7c3a30c..42188a8 100644
> --- a/lib/notmuch.h
> +++ b/lib/notmuch.h
> @@ -41,8 +41,12 @@ NOTMUCH_BEGIN_DECLS
>  #define TRUE 1
>  #endif
>  
> -#define NOTMUCH_MAJOR_VERSION	0
> -#define NOTMUCH_MINOR_VERSION	17
> +/*
> + * The library version number.  This must agree with the soname
> + * version in Makefile.local.
> + */
> +#define NOTMUCH_MAJOR_VERSION	3
> +#define NOTMUCH_MINOR_VERSION	0
>  #define NOTMUCH_MICRO_VERSION	0
>  
>  /*
> -- 
> 1.8.4.rc3