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

fixup! Upgrade to MSVC 2017

Browse Source
This commit is contained in:
Roland Winklmeier
2017-11-17 16:06:32 +01:00
parent 7cd4c415fa
commit 4001fad023
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
installer/installbuilder/vcredist.xml
View File

@@ -1,6 +1,6 @@
<component> <component>
<name>vcruntime</name> <name>vcruntime</name>
<description>Visual Studio 2015 Redistributables</description> <description>Visual Studio 2017 Redistributables</description>
<canBeEdited>0</canBeEdited> <canBeEdited>0</canBeEdited>
<selected>1</selected> <selected>1</selected>
<show>1</show> <show>1</show>
@@ -11,38 +11,44 @@
<name>vcredist</name> <name>vcredist</name>
<platforms>windows</platforms> <platforms>windows</platforms>
<actionList> <actionList>
<registryGet>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86</key>
<name>Version</name>
<variable>vcruntimeversionx86</variable>
</registryGet>
<registryGet>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64</key>
<name>Version</name>
<variable>vcruntimeversionx64</variable>
</registryGet>
<runProgram> <runProgram>
<program>${installdir}/vcredist/vcredist_x86.exe</program> <program>${installdir}/vcredist/vcredist_x86.exe</program>
<programArguments>/install /quiet /norestart</programArguments> <programArguments>/install /quiet /norestart</programArguments>
<progressText>Installing VC++ 2015 32 Bit Runtime</progressText> <progressText>Installing VC++ 2017 32 Bit Runtime</progressText>
<ruleList> <ruleList>
<registryTest>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86</key>
<logic>does_not_exist</logic>
<name>Installed</name>
<type>REG_DWORD</type>
<wowMode>32</wowMode>
</registryTest>
<fileExists> <fileExists>
<path>${installdir}/vcredist/vcredist_x86.exe</path> <path>${installdir}/vcredist/vcredist_x86.exe</path>
</fileExists> </fileExists>
<compareVersions>
<logic>greater</logic>
<version1>14.11.25325.0</version1>
<version2>${vcruntimeversionx86}</version2>
</compareVersions>
</ruleList> </ruleList>
</runProgram> </runProgram>
<runProgram> <runProgram>
<program>${installdir}/vcredist/vcredist_x64.exe</program> <program>${installdir}/vcredist/vcredist_x64.exe</program>
<programArguments>/install /quiet /norestart</programArguments> <programArguments>/install /quiet /norestart</programArguments>
<progressText>Installing VC++ 2015 64 Bit Runtime</progressText> <progressText>Installing VC++ 2017 64 Bit Runtime</progressText>
<ruleList> <ruleList>
<registryTest>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64</key>
<logic>does_not_exist</logic>
<name>Installed</name>
<type>REG_DWORD</type>
<wowMode>64</wowMode>
</registryTest>
<fileExists> <fileExists>
<path>${installdir}/vcredist/vcredist_x64.exe</path> <path>${installdir}/vcredist/vcredist_x64.exe</path>
</fileExists> </fileExists>
<compareVersions>
<logic>greater</logic>
<version1>v14.11.25325.0</version1>
<version2>${vcruntimeversionx64}</version2>
</compareVersions>
</ruleList> </ruleList>
</runProgram> </runProgram>
</actionList> </actionList>