Re: [PATCH] python: replace hardcoding of SONAME version

diff --git a/90/6627c06fe9803b224d197e8c8063e812a368b2 b/90/6627c06fe9803b224d197e8c8063e812a368b2
new file mode 100644 (file)
index 0000000..e325b6c
--- /dev/null
+++ b/90/6627c06fe9803b224d197e8c8063e812a368b2
@@ -0,0 +1,125 @@
+Return-Path: <tomi.ollila@iki.fi>\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 18777431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 02:42:49 -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 WZ31Lof6v7Wc for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Mar 2015 02:42:45 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id C0145431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 02:42:45 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 46C8E1000F3;\r
+       Sat,  7 Mar 2015 12:42:24 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] python: replace hardcoding of SONAME version\r
+In-Reply-To: <1425713474-8344-1-git-send-email-david@tethera.net>\r
+References: <1425713474-8344-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 07 Mar 2015 12:42:23 +0200\r
+Message-ID: <m2a8zpqeb4.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 10:42:49 -0000\r
+\r
+On Sat, Mar 07 2015, David Bremner <david@tethera.net> wrote:\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
+Looks sensible me -- anyone knowing more how 'pythonic' the variable\r
+convention used is (i.e. is plain SOVERSION -- or any other issues) good?\r
+\r
+Tomi\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r