[git] GPGME - branch, master, updated. gpgme-1.6.0-208-g52efcf1
by Justus Winter
cvs at cvs.gnupg.org
Thu Jul 7 14:19:52 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 52efcf1ee9fc8ba4c6bd23d8fe4f5f7993ba9fb1 (commit)
via 38c408560c6ebc3ea5eeeade01d38750bf5799e5 (commit)
via 49286ac1c82c480e2c718f828c57da9778ccd0b9 (commit)
from fc0267233239b42e9fb74a8acd7511503e287a9e (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 52efcf1ee9fc8ba4c6bd23d8fe4f5f7993ba9fb1
Author: Justus Winter <justus at g10code.com>
Date: Wed Jul 6 10:59:18 2016 +0200
python: Fix distcheck.
* lang/python/INSTALL: Drop obsolete file.
* lang/python/Makefile.am (EXTRA_DIST): Add missing files.
(CLEANFILES): Remove generated files.
(clean-local): Fix permissions of copied files.
* lang/python/tests/Makefile.am (TESTS): Use our own setup and
teardown scripts.
(EXTRA_DIST): Add missing files.
* lang/python/tests/final.py: New file.
* lang/python/tests/initial.py: Likewise.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/lang/python/INSTALL b/lang/python/INSTALL
deleted file mode 100644
index 18ece20..0000000
--- a/lang/python/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-To build pyme module without installing it run 'make'.
-
-To install pyme module run 'make install'. The module will be installed in the
-site-packages subdirectory of the python library directory.
-
-To delete all files generated during build run 'make reallyclean'
-
-To build documentation run 'make docs'. HTML files will be generated in 'doc'
-subdirectory.
-
-To build distribution files including Debian packages run 'make dist'
-To build distribution archive without Debian packages and without debian
- subdirectory run 'make nondeb-dist'
-Note, Debian packages and distribution archive will be generated in the parent
- directory.
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 8f0e74f..527212a 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -16,7 +16,13 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = README
+EXTRA_DIST = \
+ README \
+ gpgme.i \
+ helpers.c helpers.h \
+ gpgme-h-clean.py \
+ pyme
+
SUBDIRS = tests
COPY_FILES = \
@@ -48,11 +54,18 @@ all-local: gpgme_wrap.c pyme/pygpgme.py copystamp
CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
$(PYTHON) setup.py build --verbose
-clean-local:
- rm -rf -- build gpgme.h errors.i gpgme_wrap.c pyme/pygpgme.py \
+CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/pygpgme.py \
copystamp
+
+# Remove the rest.
+#
+# 'make distclean' clears the write bit, breaking rm -rf. Fix the
+# permissions.
+clean-local:
+ rm -rf -- build
if test "$(srcdir)" != "$(builddir)" ; then \
- rm -rf pyme helpers.c helpers.h ; \
+ find . -type d ! -perm -200 -exec chmod u+w {} ';' ; \
+ rm -rf README pyme helpers.c helpers.h ; \
fi
install-exec-local:
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index b51562c..69985bb 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -49,9 +49,8 @@ py_tests = t-wrapper.py \
t-file-name.py \
t-idiomatic.py
-TESTS = $(top_srcdir)/tests/gpg/initial.test \
- $(py_tests) \
- $(top_srcdir)/tests/gpg/final.test
+TESTS = initial.py $(py_tests) final.py
+EXTRA_DIST = support.py $(TESTS)
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg-agent.conf pubring.kbx~ gpg.conf pubring.gpg~ \
@@ -73,7 +72,7 @@ check-local: ./gpg.conf ./gpg-agent.conf ./pubring-stamp \
# To guarantee that check-local is run before any tests we
# add this dependency:
-$(top_srcdir)/tests/gpg/initial.test: check-local
+initial.py: check-local
./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
diff --git a/lang/python/tests/final.py b/lang/python/tests/final.py
new file mode 100755
index 0000000..f75c200
--- /dev/null
+++ b/lang/python/tests/final.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+import subprocess
+
+subprocess.check_call([os.path.join(os.getenv('top_srcdir'),
+ "tests", "start-stop-agent"), "--stop"])
diff --git a/lang/python/tests/initial.py b/lang/python/tests/initial.py
new file mode 100755
index 0000000..9d72cbc
--- /dev/null
+++ b/lang/python/tests/initial.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+import os
+import subprocess
+
+subprocess.check_call([os.path.join(os.getenv('top_srcdir'),
+ "tests", "start-stop-agent"), "--start"])
commit 38c408560c6ebc3ea5eeeade01d38750bf5799e5
Author: Justus Winter <justus at g10code.com>
Date: Wed Jul 6 11:01:55 2016 +0200
qt: Fix distcheck.
* lang/qt/src/Makefile.am (qgpgme_headers): Add missing file.
(CLEANFILES): Add generated file.
* lang/qt/tests/Makefile.am (clean-local): Remove private keys.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 7de3ef6..187bc7f 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -63,7 +63,8 @@ qgpgme_headers= \
importjob.h \
keygenerationjob.h \
keylistjob.h \
- listallkeysjob.h
+ listallkeysjob.h \
+ verifydetachedjob.h
private_qgpgme_headers = \
qgpgme_export.h \
@@ -187,7 +188,7 @@ uninstall-local: uninstall-cmake-files
BUILT_SOURCES = $(qgpgme_moc_sources)
-CLEANFILES = $(qgpgme_moc_sources)
+CLEANFILES = $(qgpgme_moc_sources) QGpgmeConfig.cmake
nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 379abb3..c49d85f 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -61,6 +61,9 @@ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp $(moc_files)
+clean-local:
+ -rm -fR -- private-keys-v1.d
+
export GNUPGHOME := $(abs_builddir)
./pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
commit 49286ac1c82c480e2c718f828c57da9778ccd0b9
Author: Justus Winter <justus at g10code.com>
Date: Thu Jul 7 13:23:05 2016 +0200
cpp: Fix distcheck.
* lang/cpp/src/Makefile.am (CLEANFILES): Remove generated file.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 364d2ca..e9deca9 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -93,3 +93,5 @@ uninstall-cmake-files:
install-data-local: install-cmake-files
uninstall-local: uninstall-cmake-files
+
+CLEANFILES = GpgmeppConfig.cmake
-----------------------------------------------------------------------
Summary of changes:
lang/cpp/src/Makefile.am | 2 ++
lang/python/INSTALL | 15 ---------------
lang/python/Makefile.am | 21 +++++++++++++++++----
lang/python/tests/Makefile.am | 7 +++----
lang/python/tests/{t-wrapper.py => final.py} | 9 ++++-----
lang/python/tests/{t-wrapper.py => initial.py} | 9 ++++-----
lang/qt/src/Makefile.am | 5 +++--
lang/qt/tests/Makefile.am | 3 +++
8 files changed, 36 insertions(+), 35 deletions(-)
delete mode 100644 lang/python/INSTALL
copy lang/python/tests/{t-wrapper.py => final.py} (76%)
copy lang/python/tests/{t-wrapper.py => initial.py} (76%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list