1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id E60F5431FD2
\r
6 for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 10:36:59 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id zvvjqHUeuYKL for <notmuch@notmuchmail.org>;
\r
16 Wed, 4 Dec 2013 10:36:53 -0800 (PST)
\r
17 Received: from mail-qa0-f49.google.com (mail-qa0-f49.google.com
\r
18 [209.85.216.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id A412F431FD0
\r
21 for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 10:36:53 -0800 (PST)
\r
22 Received: by mail-qa0-f49.google.com with SMTP id ii20so6967965qab.1
\r
23 for <notmuch@notmuchmail.org>; Wed, 04 Dec 2013 10:36:51 -0800 (PST)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=1e100.net; s=20130820;
\r
26 h=x-gm-message-state:from:to:cc:subject:in-reply-to:references
\r
27 :user-agent:date:message-id:mime-version:content-type;
\r
28 bh=D9pMdkRg5dqzwVZkHgPAvbPHeE91jBcSr20D80Mi6iM=;
\r
29 b=jgFbKrv9vEaHCQwD709PsJhedIina2AfDngyCjcT4SuA67cPcEWR+pvb0BMYixy8y3
\r
30 YvzMw9CDOU3VrwxYywgT5UIRwsyRsPd8FjTHJ2Qfvup19qXeVeveYCnYd4GNvAa0hv4o
\r
31 YaiRZdEtu0FYUz+E2+Sdtu2KpDgv6uPuRruKVWFMs/EFH9+7cwhhG/eptDFyqcB6KpUR
\r
32 VqdMKWMDTVGoCbS9G2U+Ete6FS+STzMG7c2Ts2+Mmjfs7oPtcWXudguN3eeT6CO+SISW
\r
33 mCsP8d3iyo4z/5ZBv6z+cKZr1OYlxJRgTtb6aSOIDbgG6LZVAembih5oI24XhD2sHTSR
\r
36 ALoCoQmic1Z4Oi8NNg/N3dw3IkTMNq82ESgC+SLLWCvkNlSIeFf+HZ7DFRjekfTGSMsfr7a1OE9j
\r
37 X-Received: by 10.49.15.227 with SMTP id a3mr111501189qed.66.1386182211832;
\r
38 Wed, 04 Dec 2013 10:36:51 -0800 (PST)
\r
39 Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])
\r
40 by mx.google.com with ESMTPSA id b4sm43197867qai.7.2013.12.04.10.36.50
\r
41 for <multiple recipients>
\r
42 (version=TLSv1.1 cipher=RC4-SHA bits=128/128);
\r
43 Wed, 04 Dec 2013 10:36:51 -0800 (PST)
\r
44 From: Jani Nikula <jani@nikula.org>
\r
45 To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
\r
46 Subject: Re: [PATCH 1/3] lib: Make VERSION macros agree with soname version
\r
47 In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu>
\r
48 References: <1386173986-9624-1-git-send-email-amdragon@mit.edu>
\r
49 User-Agent: Notmuch/0.17~rc2+4~gd7b0a0a (http://notmuchmail.org) Emacs/23.2.1
\r
50 (x86_64-pc-linux-gnu)
\r
51 Date: Wed, 04 Dec 2013 19:36:33 +0100
\r
52 Message-ID: <87txeosbta.fsf@nikula.org>
\r
54 Content-Type: text/plain; charset=us-ascii
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Wed, 04 Dec 2013 18:37:00 -0000
\r
69 On Wed, 04 Dec 2013, Austin Clements <amdragon@MIT.EDU> wrote:
\r
70 > We have two distinct "library version" numbers: the soname version and
\r
71 > the version macros. We need both for different reasons: the version
\r
72 > macros enable easy compile-time version detection (and conditional
\r
73 > compilation), while the soname version enables runtime version
\r
74 > detection (which includes the version checking done by things like the
\r
77 > However, currently, these two version numbers are different, which is
\r
78 > unnecessary and can lead to confusion (especially in things like
\r
79 > Debian, which include the soname version in the package name). This
\r
80 > patch makes them the same by bumping the version macros up to agree
\r
81 > with the soname version.
\r
83 The patches look good to me. Thanks for spotting and fixing this in the
\r
84 nick of time before releasing.
\r
91 > (We should probably keep the version number in just one place so they
\r
92 > can't get out of sync, but that can be done in another patch.)
\r
94 > lib/Makefile.local | 3 +++
\r
95 > lib/notmuch.h | 8 ++++++--
\r
96 > 2 files changed, 9 insertions(+), 2 deletions(-)
\r
98 > diff --git a/lib/Makefile.local b/lib/Makefile.local
\r
99 > index 155ac02..cd2c60d 100644
\r
100 > --- a/lib/Makefile.local
\r
101 > +++ b/lib/Makefile.local
\r
102 > @@ -18,6 +18,9 @@ LIBNOTMUCH_VERSION_MINOR = 0
\r
103 > # simply compatible changes to the implementation).
\r
104 > LIBNOTMUCH_VERSION_RELEASE = 0
\r
106 > +# Note: Don't forget to change the VERSION macros in notmuch.h when
\r
107 > +# any of the above change.
\r
109 > ifeq ($(PLATFORM),MACOSX)
\r
110 > LIBRARY_SUFFIX = dylib
\r
111 > # On OS X, library version numbers go before suffix.
\r
112 > diff --git a/lib/notmuch.h b/lib/notmuch.h
\r
113 > index 7c3a30c..42188a8 100644
\r
114 > --- a/lib/notmuch.h
\r
115 > +++ b/lib/notmuch.h
\r
116 > @@ -41,8 +41,12 @@ NOTMUCH_BEGIN_DECLS
\r
120 > -#define NOTMUCH_MAJOR_VERSION 0
\r
121 > -#define NOTMUCH_MINOR_VERSION 17
\r
123 > + * The library version number. This must agree with the soname
\r
124 > + * version in Makefile.local.
\r
126 > +#define NOTMUCH_MAJOR_VERSION 3
\r
127 > +#define NOTMUCH_MINOR_VERSION 0
\r
128 > #define NOTMUCH_MICRO_VERSION 0
\r