From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH] python: replace hardcoding of SONAME version
Date: Sat, 7 Mar 2015 08:31:14 +0100 [thread overview]
Message-ID: <1425713474-8344-1-git-send-email-david@tethera.net> (raw)
Failing to update this string in globals.py causes failures when the
SONAME changes. In order to hopefully reduce the number of such
errors, automate the process of setting the SONAME in the python
bindings.
---
Makefile.local | 4 +++-
bindings/python/notmuch/globals.py | 5 +++--
bindings/python/notmuch/version.py | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
After hitting the mismatch again while working on the count API, I
decided to try to fix it.
diff --git a/Makefile.local b/Makefile.local
index 81ee347..6d54742 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -107,7 +107,9 @@ dist: $(TAR_FILE)
.PHONY: update-versions
update-versions:
- sed -i "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" $(PV_FILE)
+ sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \
+ -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \
+ ${PV_FILE}
# We invoke make recursively only to force ordering of our phony
# targets in the case of parallel invocation of make (-j).
diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py
index 24b25d3..4c49d51 100644
--- a/bindings/python/notmuch/globals.py
+++ b/bindings/python/notmuch/globals.py
@@ -18,15 +18,16 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
"""
from ctypes import CDLL, Structure, POINTER
+from version import SOVERSION
#-----------------------------------------------------------------------------
#package-global instance of the notmuch library
try:
from os import uname
if uname()[0] == 'Darwin':
- nmlib = CDLL("libnotmuch.4.dylib")
+ nmlib = CDLL("libnotmuch.{0:s}.dylib".format(SOVERSION))
else:
- nmlib = CDLL("libnotmuch.so.4")
+ nmlib = CDLL("libnotmuch.so.{0:s}".format(SOVERSION))
except:
raise ImportError("Could not find shared 'notmuch' library.")
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index f719fdf..35744d3 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,3 @@
# this file should be kept in sync with ../../../version
__VERSION__ = '0.19'
+SOVERSION = '4'
--
2.1.4
next reply other threads:[~2015-03-07 7:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-07 7:31 David Bremner [this message]
2015-03-07 10:42 ` [PATCH] python: replace hardcoding of SONAME version Tomi Ollila
2015-03-08 7:35 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425713474-8344-1-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).