[git] GPGME - branch, gpgmepp, updated. gpgme-1.6.0-22-ga06603d
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Mar 2 18:56:55 CET 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, gpgmepp has been updated
via a06603d75e80aba58df58f9a41770c56b6a1f0b8 (commit)
via 77c3fb450c7adf36804a55d76ff49a06a71d22a0 (commit)
via 98e5b672422ca1e38ca38ff0357cee6cc936aee0 (commit)
via c5291a88913ace8f2115021b69c7aeb59b4f79d4 (commit)
via a313b3e28cc42785365822519b25d6a87dfdf0c9 (commit)
from 7286fc7f3d51d475f82c7c9821d031290f5b0066 (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 a06603d75e80aba58df58f9a41770c56b6a1f0b8
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 2 18:56:12 2016 +0100
Add version info for gpgmepp
* lang/cpp/src/Makefile.am (libgpgmepp_la_LDFLAGS): Add version info.
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index a06684e..a9b7ef4 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -59,6 +59,8 @@ libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP
libgpgmepp_la_LIBADD = ../../../src/libgpgme.la @LIBASSUAN_LIBS@
+libgpgmepp_la_LDFLAGS = -version-info \
+ @LIBGPGMEPP_LT_CURRENT@:@LIBGPGMEPP_LT_REVISION@:@LIBGPGMEPP_LT_AGE@
GpgmeppConfig.cmake: GpgmeppConfig.cmake.in
sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" > "$@"
commit 77c3fb450c7adf36804a55d76ff49a06a71d22a0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 2 18:41:42 2016 +0100
Add cmake configuration files
* configure.ac: Add libgpgmepp version. Configure cmake files.
* lang/cpp/src/Makefile.am: Add targets for cmake files.
(EXTRA_DIST): Add cmake files.
--
This should smooth the transition for downstream users that
have worked with KF5::Gpgmepp previously.
diff --git a/configure.ac b/configure.ac
index fc5f99e..5aad9f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,10 @@ LIBGPGME_LT_CURRENT=25
LIBGPGME_LT_AGE=14
LIBGPGME_LT_REVISION=0
+LIBGPGMEPP_LT_CURRENT=3
+LIBGPGMEPP_LT_AGE=0
+LIBGPGMEPP_LT_REVISION=0
+
# If the API is changed in an incompatible way: increment the next counter.
GPGME_CONFIG_API_VERSION=1
##############################################
@@ -104,6 +108,9 @@ AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog, [gitlog-to-changelog])
AC_SUBST(LIBGPGME_LT_CURRENT)
AC_SUBST(LIBGPGME_LT_AGE)
AC_SUBST(LIBGPGME_LT_REVISION)
+AC_SUBST(LIBGPGMEPP_LT_CURRENT)
+AC_SUBST(LIBGPGMEPP_LT_AGE)
+AC_SUBST(LIBGPGMEPP_LT_REVISION)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
@@ -653,6 +660,8 @@ AC_CONFIG_FILES(Makefile src/Makefile
src/gpgme.h)
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
+AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in)
+AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfigVersion.cmake)
AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
AC_OUTPUT
diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
new file mode 100644
index 0000000..4b5b905
--- /dev/null
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -0,0 +1,115 @@
+# CMake Config file for GPGMEPP.
+# Copyright (C) 2016 Intevation GmbH
+#
+# This file is part of GPGMEPP.
+#
+# GPGME-CL 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-CL 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 General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA
+
+# based on a generated file from cmake.
+# Generated by CMake 3.0.2
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
+ message(FATAL_ERROR "CMake >= 2.6.0 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.6)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
+foreach(_expectedTarget KF5::Gpgmepp KF5::QGpgme)
+ list(APPEND _expectedTargets ${_expectedTarget})
+ if(NOT TARGET ${_expectedTarget})
+ list(APPEND _targetsNotDefined ${_expectedTarget})
+ endif()
+ if(TARGET ${_expectedTarget})
+ list(APPEND _targetsDefined ${_expectedTarget})
+ endif()
+endforeach()
+if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
+ set(CMAKE_IMPORT_FILE_VERSION)
+ cmake_policy(POP)
+ return()
+endif()
+if(NOT "${_targetsDefined}" STREQUAL "")
+ message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
+endif()
+unset(_targetsDefined)
+unset(_targetsNotDefined)
+unset(_expectedTargets)
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+
+# Create imported target Gpgmepp
+add_library(Gpgmepp SHARED IMPORTED)
+
+set_target_properties(Gpgmepp PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
+ INTERFACE_LINK_LIBRARIES "@libdir@/libgpgme.dll.a;@LIBASSUAN_LIBS@;@GPG_ERROR_LIBS@"
+)
+
+# Create imported target QGpgme
+#add_library(QGpgme SHARED IMPORTED)
+
+#set_target_properties(KF5::QGpgme PROPERTIES
+# INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
+ # INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX} TODO"
+# INTERFACE_LINK_LIBRARIES "Qt5::Core"
+#)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+ message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(target ${_IMPORT_CHECK_TARGETS} )
+ foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
+ if(NOT EXISTS "${file}" )
+ message(FATAL_ERROR "The imported target \"${target}\" references the file
+ \"${file}\"
+but this file does not exist. Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+ \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+ endif()
+ endforeach()
+ unset(_IMPORT_CHECK_FILES_FOR_${target})
+endforeach()
+unset(_IMPORT_CHECK_TARGETS)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/lang/cpp/src/GpgmeppConfigVersion.cmake.in b/lang/cpp/src/GpgmeppConfigVersion.cmake.in
new file mode 100644
index 0000000..43d6512
--- /dev/null
+++ b/lang/cpp/src/GpgmeppConfigVersion.cmake.in
@@ -0,0 +1,31 @@
+# CMake Version file for GPGMEPP.
+# Copyright (C) 2016 Intevation GmbH
+#
+# This file is part of GPGMEPP.
+#
+# GPGME-CL 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-CL 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 General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA
+
+# based on a generated file from cmake.
+set(PACKAGE_VERSION "@LIBGPGMEPP_LT_CURRENT at .@LIBGPGMEPP_LT_AGE at .@LIBGPGMEPP_LT_REVISION at .@BUILD_REVISION@")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 0d6e4c1..a06684e 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -18,6 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA
+EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeConfigVersion.cmake.in
+
lib_LTLIBRARIES = libgpgmepp.la
main_sources = \
@@ -57,3 +59,22 @@ libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP
libgpgmepp_la_LIBADD = ../../../src/libgpgme.la @LIBASSUAN_LIBS@
+
+GpgmeppConfig.cmake: GpgmeppConfig.cmake.in
+ sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" > "$@"
+
+install-cmake-files: GpgmeppConfig.cmake GpgmeppConfigVersion.cmake
+ -$(INSTALL) -d $(DESTDIR)$(libdir)/cmake/Gpgmepp
+ $(INSTALL) GpgmeppConfig.cmake \
+ $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfig.cmake
+ $(INSTALL) GpgmeppConfigVersion.cmake \
+ $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
+
+uninstall-cmake-files:
+ -rm $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
+ -rm $(DESTDIR)$(libdir)/cmake/Gpgmepp/GpgmeppConfig.cmake
+ -rmdir $(DESTDIR)$(libdir)/cmake/Gpgmepp/
+
+install-data-local: install-cmake-files
+
+uninstall-local: uninstall-cmake-files
commit 98e5b672422ca1e38ca38ff0357cee6cc936aee0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 2 16:24:09 2016 +0100
Fix export header and windows export macros
* lang/cpp/src/gpgme_export.h: Fix variable name. Add Windows ifdefs.
diff --git a/lang/cpp/src/gpgmepp_export.h b/lang/cpp/src/gpgmepp_export.h
index 50a288d..c24bda0 100644
--- a/lang/cpp/src/gpgmepp_export.h
+++ b/lang/cpp/src/gpgmepp_export.h
@@ -7,17 +7,29 @@
# define GPGMEPP_NO_EXPORT
#else
# ifndef GPGMEPP_EXPORT
-# ifdef KF5Gpgmepp_EXPORTS
+# ifdef BUILDING_GPGMEPP
/* We are building this library */
-# define GPGMEPP_EXPORT __attribute__((visibility("default")))
+# ifdef WIN32
+# define GPGMEPP_EXPORT __declspec(dllexport)
+# else
+# define GPGMEPP_EXPORT __attribute__((visibility("default")))
+# endif
# else
/* We are using this library */
-# define GPGMEPP_EXPORT __attribute__((visibility("default")))
+# ifdef WIN32
+# define GPGMEPP_EXPORT __declspec(dllimport)
+# else
+# define GPGMEPP_EXPORT __attribute__((visibility("default")))
+# endif
# endif
# endif
# ifndef GPGMEPP_NO_EXPORT
-# define GPGMEPP_NO_EXPORT __attribute__((visibility("hidden")))
+# ifdef WIN32
+# define GPGMEPP_NO_EXPORT
+# else
+# define GPGMEPP_NO_EXPORT __attribute__((visibility("hidden")))
+# endif
# endif
#endif
commit c5291a88913ace8f2115021b69c7aeb59b4f79d4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 2 16:22:20 2016 +0100
Add header installation
* lang/cpp/src/Makefile.am: Add headers as deps and install them.
(AM_CPPFLAGS): Add BUILDING_GPGMEPP to be used in export macros.
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 3b7a514..0d6e4c1 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -32,8 +32,28 @@ main_sources = \
scdgetinfoassuantransaction.cpp gpgagentgetinfoassuantransaction.cpp \
vfsmountresult.cpp configuration.cpp
-libgpgmepp_la_SOURCES = $(main_sources) context_vanilla.cpp
+gpgmepp_headers = \
+ assuanresult.h configuration.h context.h data.h decryptionresult.h \
+ defaultassuantransaction.h editinteractor.h encryptionresult.h \
+ engineinfo.h error.h eventloopinteractor.h exception.h global.h \
+ gpgadduserideditinteractor.h gpgagentgetinfoassuantransaction.h \
+ gpgmefw.h gpgsetexpirytimeeditinteractor.h \
+ gpgsetownertrusteditinteractor.h gpgsignkeyeditinteractor.h \
+ importresult.h keygenerationresult.h key.h keylistresult.h \
+ notation.h result.h scdgetinfoassuantransaction.h signingresult.h \
+ trustitem.h verificationresult.h vfsmountresult.h gpgmepp_export.h
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@
+interface_headers= \
+ interfaces/assuantransaction.h interfaces/dataprovider.h \
+ interfaces/passphraseprovider.h interfaces/progressprovider.h
+
+gpgmeppincludedir = $(includedir)/gpgme++
+gpgmeppinclude_HEADERS = $(gpgmepp_headers)
+nobase_gpgmeppinclude_HEADERS = $(interface_headers)
+
+libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
+ $(interface_headers)
+
+AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP
libgpgmepp_la_LIBADD = ../../../src/libgpgme.la @LIBASSUAN_LIBS@
commit a313b3e28cc42785365822519b25d6a87dfdf0c9
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 2 14:00:48 2016 +0100
Add enable-languages build option
* acinclude.m4 (LIST_MEMBER): New macro.
* configure.ac (enable-languages): New option. Add info output.
* lang/Makefile.am: Only add enabled language subdirs.
diff --git a/acinclude.m4 b/acinclude.m4
index cdfe6e4..575e526 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -58,3 +58,19 @@ AC_DEFUN([GNUPG_CHECK_VA_COPY],
AC_MSG_RESULT($gnupg_cv_must_copy_va_byval)
fi
])
+
+dnl LIST_MEMBER()
+dnl Check wether an element ist contained in a list. Set `found' to
+dnl `1' if the element is found in the list, to `0' otherwise.
+AC_DEFUN([LIST_MEMBER],
+[
+name=$1
+list=$2
+found=0
+
+for n in $list; do
+ if test "x$name" = "x$n"; then
+ found=1
+ fi
+done
+])
diff --git a/configure.ac b/configure.ac
index fb6fa73..fc5f99e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,8 @@ have_w32_system=no
have_w64_system=no
build_w32_glib=no
build_w32_qt=no
+available_languages="cpp cl"
+default_languages="cpp cl"
case "${host}" in
x86_64-*mingw32*)
have_w64_system=yes
@@ -245,6 +247,24 @@ if test x$fixed_search_path != x ; then
[Locate binaries only via this PATH])
fi
+AC_ARG_ENABLE([languages],
+ AC_HELP_STRING([--enable-languages=languages],
+ [enable only specific language bindings]),
+ [enabled_languages=`echo $enableval | \
+ tr ',:' ' ' | tr '[A-Z]' '[a-z]' | \
+ sed 's/c++/cpp/'`],
+ [enabled_languages="$default_languages"])
+if test "x$enabled_languages" = "x" \
+ -o "$enabled_languages" = "no"; then
+ enabled_languages=
+fi
+for language in $enabled_languages; do
+ LIST_MEMBER($language, $available_languages)
+ if test "$found" = "0"; then
+ AC_MSG_ERROR([unsupported language binding specified])
+ fi
+done
+AC_SUBST(ENABLED_LANGUAGES, $enabled_languages)
#
# Provide information about the build.
@@ -639,12 +659,14 @@ AC_OUTPUT
echo "
GPGME v${VERSION} has been configured as follows:
- Revision: mym4_revision (mym4_revision_dec)
- Platform: $host
+ Revision: mym4_revision (mym4_revision_dec)
+ Platform: $host
+
+ UI Server: $uiserver
+ FD Passing: $use_descriptor_passing
+ GPGME Pthread: $have_pthread
- UI Server: $uiserver
- FD Passing: $use_descriptor_passing
- GPGME Pthread: $have_pthread
+ Language bindings: $enabled_languages
"
if test "x${gpg_config_script_warn}" != x; then
cat <<G10EOF
diff --git a/lang/Makefile.am b/lang/Makefile.am
index a8d33f5..bb75cf0 100644
--- a/lang/Makefile.am
+++ b/lang/Makefile.am
@@ -17,6 +17,6 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-SUBDIRS = cl cpp
+SUBDIRS = $(ENABLED_LANGUAGES)
EXTRA_DIST = README
-----------------------------------------------------------------------
Summary of changes:
acinclude.m4 | 16 +++
configure.ac | 41 +++++++-
lang/Makefile.am | 2 +-
lang/cpp/src/GpgmeppConfig.cmake.in.in | 115 +++++++++++++++++++++
.../GpgmeppConfigVersion.cmake.in} | 14 ++-
lang/cpp/src/Makefile.am | 47 ++++++++-
lang/cpp/src/gpgmepp_export.h | 20 +++-
7 files changed, 240 insertions(+), 15 deletions(-)
create mode 100644 lang/cpp/src/GpgmeppConfig.cmake.in.in
copy lang/cpp/{Makefile.am => src/GpgmeppConfigVersion.cmake.in} (63%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list