From e8235a0f533064e9530973e52e2760d1857df376 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Thu, 13 Sep 2018 14:52:28 +0200
Subject: [PATCH] Don't abort installation if vcredist returns non zero return
 code

In case, vcredist returns a non zero return code, don't automatically
abort the installation, but tell the user the error code, the consequences
and continue.

ref T344
---
 .../installbuilder/swift-pilotclient.xml      |  2 +-
 installer/installbuilder/vcredist.xml         | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/installer/installbuilder/swift-pilotclient.xml b/installer/installbuilder/swift-pilotclient.xml
index ffeb4ba53..c5e753d6c 100644
--- a/installer/installbuilder/swift-pilotclient.xml
+++ b/installer/installbuilder/swift-pilotclient.xml
@@ -138,7 +138,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
             <windowsPath></windowsPath>
         </startMenuShortcut>
         <startMenuShortcut>
-            <comment>>Run swiftlauncher</comment>
+            <comment>Run swiftlauncher</comment>
             <name>swiftlauncher ${architecture}bit</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
diff --git a/installer/installbuilder/vcredist.xml b/installer/installbuilder/vcredist.xml
index 05c8251dc..3595ef7d8 100644
--- a/installer/installbuilder/vcredist.xml
+++ b/installer/installbuilder/vcredist.xml
@@ -22,9 +22,11 @@
                     <variable>vcruntimeversionx64</variable>
                 </registryGet>
                 <runProgram>
+                    <abortOnError>0</abortOnError>
                     <program>${installdir}/vcredist/vcredist_x86.exe</program>
                     <programArguments>/install /quiet /norestart</programArguments>
                     <progressText>Installing VC++ 2017 32 Bit Runtime</progressText>
+                    <showMessageOnError>0</showMessageOnError>
                     <ruleList>
                         <fileExists>
                             <path>${installdir}/vcredist/vcredist_x86.exe</path>
@@ -37,9 +39,11 @@
                     </ruleList>
                 </runProgram>
                 <runProgram>
+                    <abortOnError>0</abortOnError>
                     <program>${installdir}/vcredist/vcredist_x64.exe</program>
                     <programArguments>/install /quiet /norestart</programArguments>
                     <progressText>Installing VC++ 2017 64 Bit Runtime</progressText>
+                    <showMessageOnError>0</showMessageOnError>
                     <ruleList>
                         <fileExists>
                             <path>${installdir}/vcredist/vcredist_x64.exe</path>
@@ -51,6 +55,21 @@
                         </compareVersions>
                     </ruleList>
                 </runProgram>
+                <showWarning>
+                    <text>Installation of MS Visual Studio 2017 Redistributables failed!
+Error Code: ${program_exit_code}
+Check if another version was already installed and if not, try to run the installer manually from
+${installdir}\vcredist\
+
+The installation will now continue, but swift might not work properly. If this is the case, raise a bugreport on https://dev.swift-project.org with the error code, you received.</text>
+                    <ruleList>
+                        <compareValues>
+                            <logic>does_not_equal</logic>
+                            <value1>${program_exit_code}</value1>
+                            <value2>0</value2>
+                        </compareValues>
+                    </ruleList>
+                </showWarning>
             </actionList>
             <distributionFileList>
                 <distributionFile>