From 2d56d969a29c461e7bc8762837f26f3a393c31fa Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Wed, 4 Oct 2017 11:30:21 +0200
Subject: [PATCH] Move DBus binaries into externals

ref T170
---
 externals                   |  2 +-
 install.pri                 | 62 -------------------------------------
 src/blackmisc/blackmisc.pro | 44 ++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 63 deletions(-)

diff --git a/externals b/externals
index d0dcee3ff..e3011c1e7 160000
--- a/externals
+++ b/externals
@@ -1 +1 @@
-Subproject commit d0dcee3ff9109ed48f3e3ca2e09ad944dc61a36a
+Subproject commit e3011c1e73becacd1ff1c814b63a5c7db9fa02e2
diff --git a/install.pri b/install.pri
index 52c16e176..379ef6a18 100644
--- a/install.pri
+++ b/install.pri
@@ -141,68 +141,6 @@ unix:!macx {
     INSTALLS += qt5_xcbglintegrations_plugins_target
 }
 
-############### Install DBus ##############
-
-win32-g++ {
-    DBUS_BINARY_SOURCE_DIR = $$[QT_INSTALL_BINS]
-    DBUS_BINARIES *= dbus-daemon.exe
-    dbus_binary_target.path = $${PREFIX}/bin
-
-    DBUS_LIBARY_SOURCE_DIR = $$[QT_INSTALL_BINS]
-    DBUS_LIBRARIES *= libdbus-1-3.dll
-    dbus_library_target.path = $${PREFIX}/bin
-
-    DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
-    DBUS_CONFIG_FILES *= etc/dbus-1/*
-    dbus_config_target.path = $${PREFIX}/share/dbus-1
-}
-
-win32-msvc2015 {
-    DBUS_BINARY_SOURCE_DIR = $$[QT_INSTALL_BINS]
-    DBUS_BINARIES *= dbus-daemon.exe
-    dbus_binary_target.path = $${PREFIX}/bin
-
-    DBUS_LIBARY_SOURCE_DIR = $$[QT_INSTALL_BINS]
-    DBUS_LIBRARIES *= expat.dll
-    DBUS_LIBRARIES *= dbus-1-3.dll
-    dbus_library_target.path = $${PREFIX}/bin
-
-    DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
-    DBUS_CONFIG_FILES *= etc/dbus-1/*
-    dbus_config_target.path = $${PREFIX}/share/dbus-1
-}
-
-macx {
-    # Binaries are copied from externals
-    dbus_binary_target.path = $${PREFIX}/bin
-    dbus_library_target.path = $${PREFIX}/lib
-
-    DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1
-    DBUS_CONFIG_FILES *= session.conf
-    DBUS_CONFIG_FILES *= system.conf
-    dbus_config_target.path = $${PREFIX}/share/dbus-1
-}
-
-for (BINARY, DBUS_BINARIES) {
-    BINARY_PATH = $${DBUS_BINARY_SOURCE_DIR}/$${BINARY}
-    !exists($$BINARY_PATH): error("Cannot find $${BINARY_PATH}")
-    dbus_binary_target.files *= $${BINARY_PATH}
-}
-
-for (LIBRARY, DBUS_LIBRARIES) {
-    LIBRARY_PATH = $${DBUS_LIBARY_SOURCE_DIR}/$${LIBRARY}
-    !exists($$LIBRARY_PATH): error("Cannot find $${LIBRARY_PATH}")
-    dbus_library_target.files *= $${LIBRARY_PATH}
-}
-
-for (DBUS_CONFIG_FILE, DBUS_CONFIG_FILES) {
-    DBUS_CONFIG_FILE_PATH = $${DBUS_CONFIG_SOURCE_DIR}/$${DBUS_CONFIG_FILE}
-    !exists($$DBUS_CONFIG_FILE_PATH): error("Cannot find $${DBUS_CONFIG_FILE_PATH}")
-    dbus_config_target.files *= $${DBUS_CONFIG_FILE_PATH}
-}
-
-win32|macx: INSTALLS += dbus_binary_target dbus_library_target dbus_config_target
-
 ############### Install VC runtime ##############
 
 win32-msvc2015 {
diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro
index a0956e08c..c8c68ee9e 100644
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -88,6 +88,50 @@ win32|macx {
     QMAKE_SUBSTITUTES += dbus_session_conf
 }
 
+# Copy externals to build directory
+
+win32 {
+    !isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += &&
+    # Kill all dbus sessions before trying to copy. Otherwise copy fails if the executable is in use
+    QMAKE_POST_LINK += taskkill /f /fi \"Imagename eq dbus-daemon.exe\" > nul
+
+    copy_command = xcopy /Y
+    source_path = $$EXTERNALS_BIN_DIR/*.exe
+    dest_path = $$DestRoot/bin
+}
+else:macx {
+    copy_command = cp
+    source_path = $$EXTERNALS_BIN_DIR/*
+    dest_path = $$DestRoot/bin
+}
+else:unix {
+    copy_command = cp
+    source_path = $$EXTERNALS_BIN_DIR/*
+    dest_path = $$DestRoot/bin
+}
+# Currently there is no bin folder in linux externals
+win32|macx {
+    !isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += &&
+    QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path)
+}
+
+win32 {
+    copy_command = xcopy /Y
+    source_path = $$EXTERNALS_LIB_DIR/*.dll
+    dest_path = $$DestRoot/bin
+}
+else:macx {
+    copy_command = cp
+    source_path = $$EXTERNALS_LIB_DIR/*.dylib
+    dest_path = $$DestRoot/lib
+}
+else:unix {
+    copy_command = cp
+    source_path = $$EXTERNALS_LIB_DIR/*.so*
+    dest_path = $$DestRoot/lib
+}
+!isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += &&
+QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path)
 
 win32 {
     dlltarget.path = $$PREFIX/bin