summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-10-18 10:17:12 +0300
committerAndras Timar <andras.timar@collabora.com>2018-12-29 20:15:17 +0100
commit9f60a160d19521cc0194e5516ef2d23e9d70af33 (patch)
tree35d1c1c7b2c7140c8fa0dbb8c8f8c9eb46d5e751 /external
parent6365cb0e5e1316bf0b27d22952ec63d72ef7bf5b (diff)
Copy gpgme-w32spawn.exe to workdir/LinkTarget/Executable
... to avoid "GpgME not installed correctly" message boxes during unit tests. See the mail list thread started with https://lists.freedesktop.org/archives/libreoffice/2018-October/081209.html Change-Id: Ie57e6b5a7281d8f20ba97912f3413eafaac9cfd4 Reviewed-on: https://gerrit.libreoffice.org/61903 Tested-by: Jenkins Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 0de0b8c9d80d68619b6f3c0e8d9429d8b08553fb) Reviewed-on: https://gerrit.libreoffice.org/65093 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external')
-rw-r--r--external/gpgmepp/ExternalPackage_gpgmepp.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 67c3dc64ffd3..8253f663e50c 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -27,6 +27,9 @@ else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32spawn.exe,src/gpgme-w32spawn.exe))
+$(call gb_Package_get_target_for_build,gpgmepp):
+ cp $(call gb_UnpackedTarball_get_dir,gpgmepp)/src/gpgme-w32spawn.exe $(call gb_Executable__get_dir_for_exe,cppunittester)/gpgme-w32spawn.exe
+
endif
# If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also