diff options
| author | David Bremner <david@tethera.net> | 2021-10-31 07:03:54 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-05 09:08:48 -0400 |
| commit | f17d75b83c90ae4ea75f79377f3acb873b9e564e (patch) | |
| tree | da6c0ae6b5d5e07c8a69f4dc15c8361be3f74e26 | |
| parent | 95f0c59fe98b1404ca8a4042becf650aeb09b923 (diff) | |
python-cffi: fix out-of-tree build
The main idea is to replace the hack of copying version.txt into the
bindings source with a generated _notmuch_config.py file.
This will mean that the bindings only build after configuring and
building notmuch itself. Given those constraints, "pip install ."
should work.
| -rw-r--r-- | Makefile.local | 1 | ||||
| -rw-r--r-- | bindings/python-cffi/notmuch2/_build.py | 6 | ||||
| -rw-r--r-- | bindings/python-cffi/setup.py | 3 | ||||
| -rw-r--r-- | bindings/python-cffi/version.txt | 1 | ||||
| -rwxr-xr-x | configure | 8 |
5 files changed, 13 insertions, 6 deletions
diff --git a/Makefile.local b/Makefile.local index e12b94cd..10fb9908 100644 --- a/Makefile.local +++ b/Makefile.local @@ -54,7 +54,6 @@ update-versions: sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \ -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \ ${PV_FILE} - cp version.txt bindings/python-cffi # 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-cffi/notmuch2/_build.py b/bindings/python-cffi/notmuch2/_build.py index f6184b97..45eb20c0 100644 --- a/bindings/python-cffi/notmuch2/_build.py +++ b/bindings/python-cffi/notmuch2/_build.py @@ -1,5 +1,5 @@ import cffi - +from _notmuch_config import * ffibuilder = cffi.FFI() ffibuilder.set_source( @@ -16,8 +16,8 @@ ffibuilder.set_source( #ERROR libnotmuch version < 5.1 not supported #endif """, - include_dirs=['../../lib'], - library_dirs=['../../lib'], + include_dirs=[NOTMUCH_INCLUDE_DIR], + library_dirs=[NOTMUCH_LIB_DIR], libraries=['notmuch'], ) ffibuilder.cdef( diff --git a/bindings/python-cffi/setup.py b/bindings/python-cffi/setup.py index cda52338..55fb2d24 100644 --- a/bindings/python-cffi/setup.py +++ b/bindings/python-cffi/setup.py @@ -1,6 +1,7 @@ import setuptools +from _notmuch_config import * -with open('version.txt') as fp: +with open(NOTMUCH_VERSION_FILE) as fp: VERSION = fp.read().strip() setuptools.setup( diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt deleted file mode 100644 index cd46610f..00000000 --- a/bindings/python-cffi/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.34.1 @@ -1579,6 +1579,14 @@ EOF printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)" } > sphinx.config +cat > bindings/python-cffi/_notmuch_config.py <<EOF +# _notmuch_config.py was automatically generated by the configure +# script in the root of the notmuch source tree. +NOTMUCH_VERSION_FILE='${NOTMUCH_SRCDIR}/version.txt' +NOTMUCH_INCLUDE_DIR='${NOTMUCH_SRCDIR}/lib' +NOTMUCH_LIB_DIR='${NOTMUCH_SRCDIR}/lib' +EOF + # Finally, after everything configured, inform the user how to continue. cat <<EOF |