From 12fa32cda9a8f6699476971f94ab236f9b6908ce Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Thu, 5 Dec 2013 11:19:44 +1900 Subject: [PATCH] [PATCH 1/3] lib: Make VERSION macros agree with soname version --- 8a/4ae8b0ba089d8520033ba5b5cdb581a010dc5c | 130 ++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 8a/4ae8b0ba089d8520033ba5b5cdb581a010dc5c diff --git a/8a/4ae8b0ba089d8520033ba5b5cdb581a010dc5c b/8a/4ae8b0ba089d8520033ba5b5cdb581a010dc5c new file mode 100644 index 000000000..c13a7d86d --- /dev/null +++ b/8a/4ae8b0ba089d8520033ba5b5cdb581a010dc5c @@ -0,0 +1,130 @@ +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 ED8F9431FC4 + for ; Wed, 4 Dec 2013 08:20:07 -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 z7kkQhYJt7uA for ; + Wed, 4 Dec 2013 08:20:02 -0800 (PST) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D2E3B431FCB + for ; Wed, 4 Dec 2013 08:20:00 -0800 (PST) +X-AuditID: 12074425-b7fd96d000000c39-7b-529f56308b3c +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id 20.99.03129.0365F925; Wed, 4 Dec 2013 11:20:00 -0500 (EST) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id rB4GJv9B029964; + Wed, 4 Dec 2013 11:19:58 -0500 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rB4GJqmk001674 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Wed, 4 Dec 2013 11:19:53 -0500 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VoFB2-0002Vw-Iv; Wed, 04 Dec 2013 11:19:52 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 1/3] lib: Make VERSION macros agree with soname version +Date: Wed, 4 Dec 2013 11:19:44 -0500 +Message-Id: <1386173986-9624-1-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.8.4.rc3 +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsUixCmqrGsQNj/IYO9rDYsbrd2MFk3TnS2u + 35zJ7MDscev+a3aPZ6tuMXtsOfSeOYA5issmJTUnsyy1SN8ugSvj2fwJrAUf+Cp6/59mbWCc + wtPFyMkhIWAicePUOyYIW0ziwr31bF2MXBxCArOZJP6/380K4WxglPhw8CY7hHObSaL5+leo + zFxGiY5d/cwg/WwCGhLb9i9nBLFFBKQldt6dzQpiMwt4SSy70A9mCwu4S6y5shloBwcHi4Cq + RP/nEpAwr4C9xNmzk5khzlCSWHhqG+sERt4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz8lKLdC30 + cjNL9FJTSjcxgoKF3UV1B+OEQ0qHGAU4GJV4eBXT5wUJsSaWFVfmHmKU5GBSEuUVDJ4fJMSX + lJ9SmZFYnBFfVJqTWnyIUYKDWUmEd3IgUI43JbGyKrUoHyYlzcGiJM57i8M+SEggPbEkNTs1 + tSC1CCYrw8GhJMFrGwrUKFiUmp5akZaZU4KQZuLgBBnOAzRcFqSGt7ggMbc4Mx0if4pRUUqc + 93AIUEIAJJFRmgfXC4vmV4ziQK8I82aAtPMAEwFc9yugwUxAg5sfzAMZXJKIkJJqYNz7usAp + ROv6wubc0ynr+0T7Ox4KRjPONkj5wuR0Yqk9b+HCIwYsUwvCBVnXvI+2P8Xzf1nehWf72XVm + 6ZkuXd6xR8rNrKRw2+nzdZJqTTuC3WVcni7sSrsxfyrLzCqPOcYLmwVfZwgHBK0U99cQPqSm + cnKLw46CsM6pM5nUW1M/FBTtYL/6RImlOCPRUIu5qDgRAEPO98rBAgAA +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 16:20:08 -0000 + +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. + +(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 + -- 2.26.2