mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-18 03:15:34 +08:00
Disable installing of Bitrock auto updater
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:
committed by
Mathew Sutcliffe
parent
3f924209f1
commit
d505f7b9a4
@@ -273,13 +273,14 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
|
||||
bitrock_autoupdateproject = "$${PREFIX}/../installer/installbuilder/autoupdateproject.xml"
|
||||
bitrock_project = $${PREFIX}/../installer/installbuilder/project.xml
|
||||
|
||||
# create_updater is currently not used
|
||||
create_updater.depends = copy_installer_project
|
||||
win32: create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} windows
|
||||
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
|
||||
QMAKE_EXTRA_TARGETS += create_updater
|
||||
|
||||
create_installer.depends = create_updater
|
||||
create_installer.depends = copy_installer_project
|
||||
WINDOWS64BITMODE = 0
|
||||
win32 {
|
||||
INSTALLER_PLATFORM = windows
|
||||
|
||||
@@ -14,23 +14,14 @@
|
||||
<include>
|
||||
<file>qt5-binaries.xml</file>
|
||||
</include>
|
||||
<include>
|
||||
<!--<include>
|
||||
<file>autoupdater.xml</file>
|
||||
</include>
|
||||
</include>-->
|
||||
<include>
|
||||
<file>vcredist.xml</file>
|
||||
</include>
|
||||
</componentList>
|
||||
<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>
|
||||
<path>/usr/local/var/lib/dbus</path>
|
||||
<ruleList>
|
||||
|
||||
Reference in New Issue
Block a user