GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Link 'data.h' and 'config.h' into the builddir.

Browse Source 
* 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@gmail.com>
This commit is contained in:
Alon Bar-Lev 2016-09-29 10:30:58 +03:00 committed by Justus Winter
parent 68fb8371a1
commit 453ab9d24c
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lang/python/Makefile.am
View File

@ -46,22 +46,27 @@ COPY_FILES_PYME = \
# For VPATH builds we need to copy some files because Python's # For VPATH builds we need to copy some files because Python's
# distutils are not VPATH-aware. # 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 \ if test "$(srcdir)" != "$(builddir)" ; then \
cp -R $(COPY_FILES) . ; \ cp -R $(COPY_FILES) . ; \
cp -R $(COPY_FILES_PYME) pyme ; \ cp -R $(COPY_FILES_PYME) pyme ; \
fi fi
touch $@ touch $@
data.h:
ln -s "$(top_srcdir)/src/data.h"
config.h:
ln -s "$(top_builddir)/config.h"
all-local: copystamp all-local: copystamp
for PYTHON in $(PYTHONS); do \ for PYTHON in $(PYTHONS); do \
CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ CFLAGS="$(CFLAGS)" \
top_builddir="$(top_builddir)" \
$$PYTHON setup.py build --verbose ; \ $$PYTHON setup.py build --verbose ; \
done done
dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ CFLAGS="$(CFLAGS)" \
$(PYTHON) setup.py sdist --verbose $(PYTHON) setup.py sdist --verbose
gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz 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 $^ twine upload $^
CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \ CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
copystamp data.h config.h copystamp
# Remove the rest. # Remove the rest.
# #

2
lang/python/gpgme.i
View File

@ -183,7 +183,7 @@
representation of struct gpgme_data for an very efficient check if representation of struct gpgme_data for an very efficient check if
the buffer has been modified. */ the buffer has been modified. */
%{ %{
#include "src/data.h" /* For struct gpgme_data. */ #include "data.h" /* For struct gpgme_data. */
%} %}
#endif #endif

4
lang/python/setup.py.in
View File

@ -39,10 +39,6 @@ if os.path.exists("../../src/gpgme-config"):
in_tree = True in_tree = True
gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags
gpgme_h = "../../src/gpgme.h" 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 library_dirs = ["../../src/.libs"] # XXX uses libtool internals
extra_macros.update( extra_macros.update(
HAVE_CONFIG_H=1, HAVE_CONFIG_H=1,