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

[installer] Hide the option to skip the bootstrap step

Browse Source 
behind an option to "show advanced options"
This commit is contained in:
Mat Sutcliffe
2019-10-20 12:59:14 +01:00
committed by Klaus Basan
parent 6b809cd896
commit 3cabc10461
1 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
installer/installbuilder/project.xml
View File

@@ -183,6 +183,29 @@ it and relaunch the installer.</text>
</platformTest> </platformTest>
</ruleList> </ruleList>
</writeFile> </writeFile>
<runProgram>
<program>${installdir}/bin/swiftlauncher</program>
<programArguments>-i --bootstrapurl https://datastore.swift-project.org/shared/ &amp;</programArguments>
<progressText>Run swift launcher wizard</progressText>
<ruleList>
<platformTest>
<negate>1</negate>
<type>osx</type>
</platformTest>
<isFalse value="${skipwizard}" />
</ruleList>
</runProgram>
<runProgram>
<program>open</program>
<programArguments>${Installdir}/bin/swiftlauncher.app --args -i --bootstrapurl https://datastore.swift-project.org/shared/ &amp;</programArguments>
<progressText>Run swift launcher wizard</progressText>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
<isFalse value="${skipwizard}" />
</ruleList>
</runProgram>
</postInstallationActionList> </postInstallationActionList>
<preUninstallationActionList> <preUninstallationActionList>
<actionGroup> <actionGroup>
@@ -298,28 +321,6 @@ it and relaunch the uninstaller.</text>
</language> --> </language> -->
</customLanguageFileList> </customLanguageFileList>
<finalPageActionList> <finalPageActionList>
<runProgram>
<program>${installdir}/bin/swiftlauncher</program>
<programArguments>-i --bootstrapurl https://datastore.swift-project.org/shared/ &amp;</programArguments>
<progressText>Run swift launcher wizard</progressText>
<ruleList>
<platformTest>
<negate>1</negate>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>open</program>
<programArguments>${Installdir}/bin/swiftlauncher.app --args -i --bootstrapurl https://datastore.swift-project.org/shared/ &amp;</programArguments>
<progressText>Run swift launcher wizard</progressText>
<ruleList>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
<!-- <launchBrowser> <!-- <launchBrowser>
<url>http://www.swift-project.org</url> <url>http://www.swift-project.org</url>
<progressText>Visit the swift project page</progressText> <progressText>Visit the swift project page</progressText>
@@ -333,25 +334,44 @@ it and relaunch the uninstaller.</text>
</licenseFile> </licenseFile>
</licenseFileList> </licenseFileList>
<parameterList> <parameterList>
<directoryParameter> <parameterGroup>
<name>installdir</name> <name>install</name>
<description>Installer.Parameter.installdir.description</description> <title>Installation</title>
<explanation>Installer.Parameter.installdir.explanation</explanation> <parameterList>
<value></value> <directoryParameter>
<default>${platform_install_prefix}/${project.shortName}-${project.version}-${architecture}bit</default> <name>installdir</name>
<allowEmptyValue>0</allowEmptyValue> <description>Installer.Parameter.installdir.description</description>
<cliOptionName>prefix</cliOptionName> <explanation>Installer.Parameter.installdir.explanation</explanation>
<mustBeWritable>yes</mustBeWritable> <value></value>
<mustExist>0</mustExist> <default>${platform_install_prefix}/${project.shortName}-${project.version}-${architecture}bit</default>
<width>40</width> <allowEmptyValue>0</allowEmptyValue>
</directoryParameter> <cliOptionName>prefix</cliOptionName>
<stringParameter name="architecture" value="64" ask="0"> <mustBeWritable>yes</mustBeWritable>
<description></description> <mustExist>0</mustExist>
<explanation></explanation> <width>40</width>
<default></default> </directoryParameter>
<allowEmptyValue>1</allowEmptyValue> <stringParameter name="architecture" value="64" ask="0">
<width>40</width> <description></description>
</stringParameter> <explanation></explanation>
<default></default>
<allowEmptyValue>1</allowEmptyValue>
<width>40</width>
</stringParameter>
<booleanParameterGroup>
<name>advanced</name>
<title>Advanced options</title>
<description>Enable advanced options</description>
<parameterList>
<booleanParameter>
<name>skipwizard</name>
<description>Don't run configuration wizard (swift must be configured manually!)</description>
<displayStyle>checkbox-left</displayStyle>
<value>0</value>
</booleanParameter>
</parameterList>
</booleanParameterGroup>
</parameterList>
</parameterGroup>
</parameterList> </parameterList>
<platformOptionsList> <platformOptionsList>
<platformOptions> <platformOptions>