[git] GPGME - branch, master, updated. gpgme-1.7.0-24-g453ab9d
by Alon Bar-Lev
cvs at cvs.gnupg.org
Fri Sep 30 16:03:21 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, master has been updated
via 453ab9d24ca48c9e01d21e1454d6b08de1938b76 (commit)
via 68fb8371a1dd5f4e05e50b1733f9996d139cbf38 (commit)
via d1509428f30c278ee7e99e2bca5559c5b2536721 (commit)
from 7302791c0d308c3284ac24a743035d27a0c0b6ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 453ab9d24ca48c9e01d21e1454d6b08de1938b76
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date: Thu Sep 29 10:30:58 2016 +0300
python: Link 'data.h' and 'config.h' into the builddir.
* lang/python/Makefile.am: Link to the files.
* lang/python/gpgme.i: Update path.
* lang/python/setup.py.in: Do not add the top builddir to the include
path.
--
To make it easy to build the subpackage using standard tools without
altering environment or CFLAGS, symlink the required artifacts from
source tree into subpackage directory when preparing sources.
Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index ea37da9..9cb99c4 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -46,22 +46,27 @@ COPY_FILES_PYME = \
# For VPATH builds we need to copy some files because Python's
# distutils are not VPATH-aware.
-copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
+copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h config.h
if test "$(srcdir)" != "$(builddir)" ; then \
cp -R $(COPY_FILES) . ; \
cp -R $(COPY_FILES_PYME) pyme ; \
fi
touch $@
+data.h:
+ ln -s "$(top_srcdir)/src/data.h"
+
+config.h:
+ ln -s "$(top_builddir)/config.h"
+
all-local: copystamp
for PYTHON in $(PYTHONS); do \
- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
- top_builddir="$(top_builddir)" \
+ CFLAGS="$(CFLAGS)" \
$$PYTHON setup.py build --verbose ; \
done
dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
+ CFLAGS="$(CFLAGS)" \
$(PYTHON) setup.py sdist --verbose
gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
@@ -76,7 +81,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
twine upload $^
CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
- copystamp
+ data.h config.h copystamp
# Remove the rest.
#
diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index eaeb4f8..5d074aa 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -183,7 +183,7 @@
representation of struct gpgme_data for an very efficient check if
the buffer has been modified. */
%{
-#include "src/data.h" /* For struct gpgme_data. */
+#include "data.h" /* For struct gpgme_data. */
%}
#endif
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
index 7af2d48..4c41673 100755
--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
@@ -39,10 +39,6 @@ if os.path.exists("../../src/gpgme-config"):
in_tree = True
gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags
gpgme_h = "../../src/gpgme.h"
- if 'top_builddir' in os.environ:
- include_dirs.append(os.environ['top_builddir'])
- # Make sure that SWIG finds config.h when processing gpgme.i.
- extra_swig_opts.append("-I{0}".format(os.environ['top_builddir']))
library_dirs = ["../../src/.libs"] # XXX uses libtool internals
extra_macros.update(
HAVE_CONFIG_H=1,
commit 68fb8371a1dd5f4e05e50b1733f9996d139cbf38
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date: Thu Sep 29 10:30:57 2016 +0300
python: Add 'prepare' target.
* lang/python/Makefile.am: Add 'prepare' target.
--
This enables preparing the package using autoconf then build using
distutils as separate stage.
Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 1d7aee8..ea37da9 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -65,6 +65,9 @@ dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
$(PYTHON) setup.py sdist --verbose
gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
+.PHONY: prepare
+prepare: copystamp
+
.PHONY: sdist
sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
commit d1509428f30c278ee7e99e2bca5559c5b2536721
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date: Thu Sep 29 10:30:56 2016 +0300
python: Make generated 'setup.py' executable.
--
Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
diff --git a/configure.ac b/configure.ac
index 4a29f2f..efa1f19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -886,9 +886,9 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([lang/qt/doc/Doxyfile])])
AC_CONFIG_FILES(lang/qt/doc/Makefile)
AC_CONFIG_FILES([lang/python/Makefile
- lang/python/setup.py
lang/python/pyme/version.py
lang/python/tests/Makefile])
+AC_CONFIG_FILES([lang/python/setup.py], [chmod a+x lang/python/setup.py])
AC_OUTPUT
echo "
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
lang/python/Makefile.am | 18 +++++++++++++-----
lang/python/gpgme.i | 2 +-
lang/python/setup.py.in | 4 ----
4 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list