From c6c2c86d30779230218c1781949f716646d4fced Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Mon, 16 Oct 2017 14:08:51 +0100 Subject: [PATCH] Install DBus dependencies alongside XSwiftBus on Windows Summary: XSwiftBus needs to be able to locate dbus-1-3.dll, expat.dll, and dbus-daemon.exe. We simply need to install them in the same folder as XSwiftBus itself (as we already do with blackmisc.dll). Then we need to install session.conf in a share/dbus-1 subfolder where dbus-daemon.exe can find it. Reviewers: rwinklmeier Reviewed By: rwinklmeier Subscribers: jenkins Tags: #swift_pilot_client Differential Revision: https://dev.swift-project.org/D54 --- src/xswiftbus/xswiftbus.pro | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/xswiftbus/xswiftbus.pro b/src/xswiftbus/xswiftbus.pro index 89995860c..8332b0a2e 100644 --- a/src/xswiftbus/xswiftbus.pro +++ b/src/xswiftbus/xswiftbus.pro @@ -99,16 +99,27 @@ INSTALLS += target dep_target.path = $$PREFIX/$$XSWIFTBUS_DIR win32 { dep_target.files *= $$DestRoot/lib/blackmisc.dll + dep_target.files *= $$DestRoot/bin/dbus-daemon.exe + win32-g++ { + dep_target.files *= $$DestRoot/bin/libdbus-1-3.dll + } + else { + dep_target.files *= $$DestRoot/bin/dbus-1-3.dll + dep_target.files *= $$DestRoot/bin/expat.dll + } dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Core$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Gui$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Widgets$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5DBus$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Network$${DLL_DEBUG_SUFFIX}.dll dep_target.files *= $$[QT_INSTALL_BINS]/Qt5Xml$${DLL_DEBUG_SUFFIX}.dll - win32-g++: dep_target.files *= $$[QT_INSTALL_BINS]/libdbus-1-3.dll - else: dep_target.files *= $$[QT_INSTALL_BINS]/dbus-1-3.dll dep_target.CONFIG += no_check_exist + dbus_share.path = $$PREFIX/$$XSWIFTBUS_DIR/share/dbus-1 + dbus_share.files = $$DestRoot/share/dbus-1/session.conf + dbus_share.CONFIG = no_check_exist + INSTALLS += dbus_share + legacy_data_target.path = $$PREFIX/xswiftbus legacy_data_target.files *= LegacyData } else:macx: {