[PATCH] python: replace hardcoding of SONAME version

diff --git a/d5/1453bc46db484da7780ceb5385085ccd480947 b/d5/1453bc46db484da7780ceb5385085ccd480947
new file mode 100644 (file)
index 0000000..fb237f5
--- /dev/null
+++ b/d5/1453bc46db484da7780ceb5385085ccd480947
@@ -0,0 +1,109 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8AFB9431FBD\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Mar 2015 23:32:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id WiFyjKaRInQ3 for <notmuch@notmuchmail.org>;\r
+       Fri,  6 Mar 2015 23:32:20 -0800 (PST)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 44117431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Mar 2015 23:32:20 -0800 (PST)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1YU9Cu-00025h-Gw; Sat, 07 Mar 2015 07:31:32 +0000\r
+Received: (nullmailer pid 8455 invoked by uid 1000); Sat, 07 Mar 2015\r
+       07:31:19 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] python: replace hardcoding of SONAME version\r
+Date: Sat,  7 Mar 2015 08:31:14 +0100\r
+Message-Id: <1425713474-8344-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 Mar 2015 07:32:23 -0000\r
+\r
+Failing to update this string in globals.py causes failures when the\r
+SONAME changes.  In order to hopefully reduce the number of such\r
+errors, automate the process of setting the SONAME in the python\r
+bindings.\r
+---\r
+ Makefile.local                     | 4 +++-\r
+ bindings/python/notmuch/globals.py | 5 +++--\r
+ bindings/python/notmuch/version.py | 1 +\r
+ 3 files changed, 7 insertions(+), 3 deletions(-)\r
+\r
+After hitting the mismatch again while working on the count API, I\r
+decided to try to fix it.\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 81ee347..6d54742 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -107,7 +107,9 @@ dist: $(TAR_FILE)\r
+ .PHONY: update-versions\r
+ \r
+ update-versions:\r
+-      sed -i "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" $(PV_FILE)\r
++      sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \\r
++          -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \\r
++          ${PV_FILE}\r
+ \r
+ # We invoke make recursively only to force ordering of our phony\r
+ # targets in the case of parallel invocation of make (-j).\r
+diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py\r
+index 24b25d3..4c49d51 100644\r
+--- a/bindings/python/notmuch/globals.py\r
++++ b/bindings/python/notmuch/globals.py\r
+@@ -18,15 +18,16 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+ """\r
+ \r
+ from ctypes import CDLL, Structure, POINTER\r
++from version import SOVERSION\r
+ \r
+ #-----------------------------------------------------------------------------\r
+ #package-global instance of the notmuch library\r
+ try:\r
+     from os import uname\r
+     if uname()[0] == 'Darwin':\r
+-        nmlib = CDLL("libnotmuch.4.dylib")\r
++        nmlib = CDLL("libnotmuch.{0:s}.dylib".format(SOVERSION))\r
+     else:\r
+-        nmlib = CDLL("libnotmuch.so.4")\r
++        nmlib = CDLL("libnotmuch.so.{0:s}".format(SOVERSION))\r
+ except:\r
+     raise ImportError("Could not find shared 'notmuch' library.")\r
+ \r
+diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py\r
+index f719fdf..35744d3 100644\r
+--- a/bindings/python/notmuch/version.py\r
++++ b/bindings/python/notmuch/version.py\r
+@@ -1,2 +1,3 @@\r
+ # this file should be kept in sync with ../../../version\r
+ __VERSION__ = '0.19'\r
++SOVERSION = '4'\r
+-- \r
+2.1.4\r
+\r