flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-24 18:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bug][Windows][Installer][DBus] Install session.conf in the correct location where dbus-daemon will look for it.

Browse Source 
Summary:
On Windows, libdbus will spawn dbus-daemon when swift tries to connect to the session bus.

The daemon looks for session.conf in the share directory.
This patch ensures session.conf is installed in that directory.

Fixes T79.

Reviewers: rwinklmeier

Reviewed By: rwinklmeier

Subscribers: jenkins

Tags: #swift_pilot_client

Maniphest Tasks: T79

Differential Revision: https://dev.swift-project.org/D22
This commit is contained in:
Mathew Sutcliffe
2017-05-14 15:01:49 +01:00
parent ff2687fbe9
commit 50b8fbe8fe
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install.pri
View File

@@ -154,7 +154,7 @@ win32-g++ {
DBUS_CONFIG_SOURCE_DIR = $$SourceRoot DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
DBUS_CONFIG_FILES *= etc/dbus-1/* DBUS_CONFIG_FILES *= etc/dbus-1/*
dbus_config_target.path = $${PREFIX}/etc/dbus-1 dbus_config_target.path = $${PREFIX}/share/dbus-1
} }
win32-msvc2015 { win32-msvc2015 {
@@ -169,7 +169,7 @@ win32-msvc2015 {
DBUS_CONFIG_SOURCE_DIR = $$SourceRoot DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
DBUS_CONFIG_FILES *= etc/dbus-1/* DBUS_CONFIG_FILES *= etc/dbus-1/*
dbus_config_target.path = $${PREFIX}/etc/dbus-1 dbus_config_target.path = $${PREFIX}/share/dbus-1
} }
macx { macx {
@@ -180,7 +180,7 @@ macx {
DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1 DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1
DBUS_CONFIG_FILES *= session.conf DBUS_CONFIG_FILES *= session.conf
DBUS_CONFIG_FILES *= system.conf DBUS_CONFIG_FILES *= system.conf
dbus_config_target.path = $${PREFIX}/etc/dbus-1 dbus_config_target.path = $${PREFIX}/share/dbus-1
} }
for (BINARY, DBUS_BINARIES) { for (BINARY, DBUS_BINARIES) {

11
installer/installbuilder/qt5-binaries.xml
View File

@@ -63,17 +63,6 @@
</distributionFile> </distributionFile>
</distributionFileList> </distributionFileList>
</folder> </folder>
<folder>
<description>etc</description>
<destination>${installdir}/</destination>
<name>etc</name>
<platforms>windows</platforms>
<distributionFileList>
<distributionDirectory>
<origin>../../dist/etc</origin>
</distributionDirectory>
</distributionFileList>
</folder>
<folder> <folder>
<description>lib</description> <description>lib</description>
<destination>${installdir}/lib</destination> <destination>${installdir}/lib</destination>

6
src/blackmisc/dbusserver.cpp
View File

@@ -105,9 +105,9 @@ namespace BlackMisc
void CDBusServer::launchDBusDaemon() void CDBusServer::launchDBusDaemon()
{ {
const QString program = QStringLiteral("dbus-daemon"); static const QString program = QStringLiteral("dbus-daemon");
const QStringList arguments = { QStringLiteral("--config-file=../etc/dbus-1/session.conf") }; static const QStringList arguments = { QStringLiteral("--session") };
bool success = CProcessCtrl::startDetached(program, arguments, false); const bool success = CProcessCtrl::startDetached(program, arguments, false);
if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); } if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); }
} }