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

[Installer] Check if EOL has expired before installing

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-07-05 23:20:18 +01:00
parent 89434c355d
commit 93998720b2
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install.pri
View File

@@ -248,6 +248,7 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} \ project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} \
project.version=$$swiftConfig(version.full) \ project.version=$$swiftConfig(version.full) \
versionFull=$$swiftConfig(version.full).$${VER_REV} \ versionFull=$$swiftConfig(version.full).$${VER_REV} \
endOfLife=$$swiftConfig(endOfLife) \
project.windows64bitMode=$${WINDOWS64BITMODE} \ project.windows64bitMode=$${WINDOWS64BITMODE} \
project.enableDebugger=$${INSTALLER_DEBUG} \ project.enableDebugger=$${INSTALLER_DEBUG} \
architecture=$${ARCHITECTURE} architecture=$${ARCHITECTURE}

18
installer/installbuilder/project.xml
View File

@@ -24,6 +24,20 @@
</include> </include>
</componentList> </componentList>
<functionDefinitionList> <functionDefinitionList>
<actionDefinition>
<name>checkExpiryDate</name>
<actionList>
<createTimeStamp>
<variable>installDate</variable>
</createTimeStamp>
<throwError>
<ruleList>
<compareValues value1="${installDate}" logic="greater_or_equal" value2="${endOfLife}" />
</ruleList>
<customErrorMessage>This version has expired. Please download a more recent version.</customErrorMessage>
</throwError>
</actionList>
</actionDefinition>
<actionDefinition> <actionDefinition>
<name>checkForRunningSwift</name> <name>checkForRunningSwift</name>
<actionList> <actionList>
@@ -86,6 +100,7 @@ It must be closed before the installation can proceed</progressText>
</actionDefinition> </actionDefinition>
</functionDefinitionList> </functionDefinitionList>
<preInstallationActionList> <preInstallationActionList>
<checkExpiryDate />
<checkForRunningSwift /> <checkForRunningSwift />
<killDBusDaemon /> <killDBusDaemon />
<!-- TODO Linux/MacOS: Save and load last install dir --> <!-- TODO Linux/MacOS: Save and load last install dir -->
@@ -326,6 +341,9 @@ It must be closed before the installation can proceed</progressText>
<default></default> <default></default>
<allowEmptyValue>1</allowEmptyValue> <allowEmptyValue>1</allowEmptyValue>
</stringParameter> </stringParameter>
<stringParameter name="endOfLife" value="21000101" ask="0">
<default>21000101</default>
</stringParameter>
<stringParameter name="architecture" value="64" ask="0"> <stringParameter name="architecture" value="64" ask="0">
<description></description> <description></description>
<explanation></explanation> <explanation></explanation>