From 117ed93d37fbde90f5decb7292ed0c42e5e39220 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 2 Aug 2017 21:57:34 -0600 Subject: One copy of the gpg helpers is enough. --- .../mime/mimetreeparser/autotests/CMakeLists.txt | 2 +- .../autotests/kdepim_add_gpg_crypto_test.cmake | 61 ---------------------- .../kdepim_generate_crypto_test_wrapper.cmake | 45 ---------------- .../mime/mimetreeparser/tests/CMakeLists.txt | 2 +- .../tests/kdepim_add_gpg_crypto_test.cmake | 61 ---------------------- .../kdepim_generate_crypto_test_wrapper.cmake | 45 ---------------- 6 files changed, 2 insertions(+), 214 deletions(-) delete mode 100644 framework/src/domain/mime/mimetreeparser/autotests/kdepim_add_gpg_crypto_test.cmake delete mode 100644 framework/src/domain/mime/mimetreeparser/autotests/kdepim_generate_crypto_test_wrapper.cmake delete mode 100644 framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake delete mode 100644 framework/src/domain/mime/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake (limited to 'framework/src/domain') diff --git a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt index 9b26d885..f0b1f5f5 100644 --- a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt @@ -7,7 +7,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../testdata" ) include(ECMAddTests) -include(${CMAKE_CURRENT_SOURCE_DIR}/kdepim_add_gpg_crypto_test.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake) # convenience macro to add qtest unit tests macro(add_mimetreeparser_unittest _source) diff --git a/framework/src/domain/mime/mimetreeparser/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/autotests/kdepim_add_gpg_crypto_test.cmake deleted file mode 100644 index 841cf6ff..00000000 --- a/framework/src/domain/mime/mimetreeparser/autotests/kdepim_add_gpg_crypto_test.cmake +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (c) 2013 Sandro Knauß -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser) -set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home ) -add_definitions( -DGNUPGHOME="${GNUPGHOME}" ) - -macro (ADD_GPG_CRYPTO_TEST _target _testname) - if (UNIX) - if (APPLE) - set(_library_path_variable "DYLD_LIBRARY_PATH") - elseif (CYGWIN) - set(_library_path_variable "PATH") - else (APPLE) - set(_library_path_variable "LD_LIBRARY_PATH") - endif (APPLE) - - if (APPLE) - # DYLD_LIBRARY_PATH does not work like LD_LIBRARY_PATH - # OSX already has the RPATH in libraries and executables, putting runtime directories in - # DYLD_LIBRARY_PATH actually breaks things - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/") - else (APPLE) - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${QT_LIBRARY_DIR}") - endif (APPLE) - set(_executable "$") - - # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time - add_custom_command(TARGET ${_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} - -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable} - -D_ld_library_path="${_ld_library_path}" -D_executable=$ - -D_gnupghome="${GNUPGHOME}" - -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake - ) - - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_executable}.shell" ) - add_test(NAME ${_testname} COMMAND ${_executable}.shell) - - else (UNIX) - # under windows, set the property WRAPPER_SCRIPT just to the name of the executable - # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found) - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}\;${LIB_INSTALL_DIR}\;${QT_LIBRARY_DIR}") - set(_executable "$") - - # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time - add_custom_command(TARGET ${_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} - -D_filename="${_executable}.bat" - -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}" - -D_gnupghome="${GNUPGHOME}" - -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake - ) - - add_test(NAME ${_testname} COMMAND ${_executable}.bat) - - endif (UNIX) -endmacro (ADD_GPG_CRYPTO_TEST) - diff --git a/framework/src/domain/mime/mimetreeparser/autotests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mime/mimetreeparser/autotests/kdepim_generate_crypto_test_wrapper.cmake deleted file mode 100644 index e1412f37..00000000 --- a/framework/src/domain/mime/mimetreeparser/autotests/kdepim_generate_crypto_test_wrapper.cmake +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2013, Sandro Knauß -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -if (UNIX) - -file(WRITE "${_filename}" -"#!/bin/sh -# created by cmake, don't edit, changes will be lost - -# don't mess with a gpg-agent already running on the system -unset GPG_AGENT_INFO - -${_library_path_variable}=${_ld_library_path}\${${_library_path_variable}:+:\$${_library_path_variable}} GNUPGHOME=${_gnupghome} gpg-agent --daemon \"${_executable}\" \"$@\" -_result=$? -_pid=`echo GETINFO pid | GNUPGHOME=${_gnupghome} gpg-connect-agent | grep 'D' | cut -d' ' -f2` -if [ ! -z \"\$_pid\" ]; then - echo \"Waiting for gpg-agent to terminate (PID: $_pid)...\" - while kill -0 \"\$_pid\"; do - sleep 1 - done -fi -exit \$_result -") - -# make it executable -# since this is only executed on UNIX, it is safe to call chmod -exec_program(chmod ARGS ug+x \"${_filename}\" OUTPUT_VARIABLE _dummy ) - -else (UNIX) - -file(TO_NATIVE_PATH "${_ld_library_path}" win_path) -file(TO_NATIVE_PATH "${_gnupghome}" win_gnupghome) - -file(WRITE "${_filename}" -" -set PATH=${win_path};$ENV{PATH} -set GNUPGHOME=${win_gnupghome};$ENV{GNUPGHOME} -gpg-agent --daemon \"${_executable}\" %* -") - -endif (UNIX) diff --git a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt index 015efc32..aa58cc71 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(gnupg_home) add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../testdata" ) -include(${CMAKE_CURRENT_SOURCE_DIR}/kdepim_add_gpg_crypto_test.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. diff --git a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake deleted file mode 100644 index 841cf6ff..00000000 --- a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (c) 2013 Sandro Knauß -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser) -set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home ) -add_definitions( -DGNUPGHOME="${GNUPGHOME}" ) - -macro (ADD_GPG_CRYPTO_TEST _target _testname) - if (UNIX) - if (APPLE) - set(_library_path_variable "DYLD_LIBRARY_PATH") - elseif (CYGWIN) - set(_library_path_variable "PATH") - else (APPLE) - set(_library_path_variable "LD_LIBRARY_PATH") - endif (APPLE) - - if (APPLE) - # DYLD_LIBRARY_PATH does not work like LD_LIBRARY_PATH - # OSX already has the RPATH in libraries and executables, putting runtime directories in - # DYLD_LIBRARY_PATH actually breaks things - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/") - else (APPLE) - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${QT_LIBRARY_DIR}") - endif (APPLE) - set(_executable "$") - - # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time - add_custom_command(TARGET ${_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} - -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable} - -D_ld_library_path="${_ld_library_path}" -D_executable=$ - -D_gnupghome="${GNUPGHOME}" - -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake - ) - - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_executable}.shell" ) - add_test(NAME ${_testname} COMMAND ${_executable}.shell) - - else (UNIX) - # under windows, set the property WRAPPER_SCRIPT just to the name of the executable - # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found) - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}\;${LIB_INSTALL_DIR}\;${QT_LIBRARY_DIR}") - set(_executable "$") - - # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time - add_custom_command(TARGET ${_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} - -D_filename="${_executable}.bat" - -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}" - -D_gnupghome="${GNUPGHOME}" - -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake - ) - - add_test(NAME ${_testname} COMMAND ${_executable}.bat) - - endif (UNIX) -endmacro (ADD_GPG_CRYPTO_TEST) - diff --git a/framework/src/domain/mime/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake deleted file mode 100644 index e1412f37..00000000 --- a/framework/src/domain/mime/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2013, Sandro Knauß -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -if (UNIX) - -file(WRITE "${_filename}" -"#!/bin/sh -# created by cmake, don't edit, changes will be lost - -# don't mess with a gpg-agent already running on the system -unset GPG_AGENT_INFO - -${_library_path_variable}=${_ld_library_path}\${${_library_path_variable}:+:\$${_library_path_variable}} GNUPGHOME=${_gnupghome} gpg-agent --daemon \"${_executable}\" \"$@\" -_result=$? -_pid=`echo GETINFO pid | GNUPGHOME=${_gnupghome} gpg-connect-agent | grep 'D' | cut -d' ' -f2` -if [ ! -z \"\$_pid\" ]; then - echo \"Waiting for gpg-agent to terminate (PID: $_pid)...\" - while kill -0 \"\$_pid\"; do - sleep 1 - done -fi -exit \$_result -") - -# make it executable -# since this is only executed on UNIX, it is safe to call chmod -exec_program(chmod ARGS ug+x \"${_filename}\" OUTPUT_VARIABLE _dummy ) - -else (UNIX) - -file(TO_NATIVE_PATH "${_ld_library_path}" win_path) -file(TO_NATIVE_PATH "${_gnupghome}" win_gnupghome) - -file(WRITE "${_filename}" -" -set PATH=${win_path};$ENV{PATH} -set GNUPGHOME=${win_gnupghome};$ENV{GNUPGHOME} -gpg-agent --daemon \"${_executable}\" %* -") - -endif (UNIX) -- cgit v1.2.3