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

Disable installing of Bitrock auto updater

Browse Source 
Summary:
Disabling happens in two steps. The binary was created as dependent target
of 'make create_installer'. This step is now skipped.
The second step is to remove it from the installbuilder project
configuration.
Disabling only so far to easily get it back if needed.

ref T124

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Maniphest Tasks: T124

Differential Revision: https://dev.swift-project.org/D46
This commit is contained in:
Roland Winklmeier
2017-08-09 08:19:14 +00:00
committed by Mathew Sutcliffe
parent 3f924209f1
commit d505f7b9a4
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install.pri
View File

@@ -273,13 +273,14 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
bitrock_autoupdateproject = "$${PREFIX}/../installer/installbuilder/autoupdateproject.xml" bitrock_autoupdateproject = "$${PREFIX}/../installer/installbuilder/autoupdateproject.xml"
bitrock_project = $${PREFIX}/../installer/installbuilder/project.xml bitrock_project = $${PREFIX}/../installer/installbuilder/project.xml
# create_updater is currently not used
create_updater.depends = copy_installer_project create_updater.depends = copy_installer_project
win32: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} windows win32: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} windows
else:macx: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} osx else:macx: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} osx
else:unix: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} linux-x64 else:unix: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} linux-x64
QMAKE_EXTRA_TARGETS += create_updater QMAKE_EXTRA_TARGETS += create_updater
create_installer.depends = create_updater create_installer.depends = copy_installer_project
WINDOWS64BITMODE = 0 WINDOWS64BITMODE = 0
win32 { win32 {
INSTALLER_PLATFORM = windows INSTALLER_PLATFORM = windows

13
installer/installbuilder/project.xml
View File

@@ -14,23 +14,14 @@
<include> <include>
<file>qt5-binaries.xml</file> <file>qt5-binaries.xml</file>
</include> </include>
<include> <!--<include>
<file>autoupdater.xml</file> <file>autoupdater.xml</file>
</include> </include>-->
<include> <include>
<file>vcredist.xml</file> <file>vcredist.xml</file>
</include> </include>
</componentList> </componentList>
<postInstallationActionList> <postInstallationActionList>
<writeFile>
<path>${installdir}/update.ini</path>
<text>[Update]
url = http://127.0.0.1:8080/update.xml
version_id = 061
update_download_location = ${system_temp_directory}
check_for_updates = 1
</text>
</writeFile>
<createDirectory> <createDirectory>
<path>/usr/local/var/lib/dbus</path> <path>/usr/local/var/lib/dbus</path>
<ruleList> <ruleList>