VS integration installer: set SUCCESS=1 if we find VS 2013

Previously we would print an error message on machines where the only VS
version we find is 2013, even though we successfully install the integration
files for it.

Also, we shouldn't have two END labels.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204629 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/msbuild/install.bat b/tools/msbuild/install.bat
index 3b19fe76d81ed7f6101a271d892abbc0fc1c9184..9880fb27e9b2fe35113cf2f9a054f3c403b45dd5 100644 (file)
--- a/tools/msbuild/install.bat
+++ b/tools/msbuild/install.bat
@@ -8,7 +8,7 @@ cd /d %~dp0
 \r
 set PLATFORM=None\r
 :START\r
-IF %PLATFORM% == x64 GOTO END\r
+IF %PLATFORM% == x64 GOTO LOOPEND\r
 IF %PLATFORM% == Win32 SET PLATFORM=x64\r
 IF %PLATFORM% == None SET PLATFORM=Win32\r
 \r
@@ -30,7 +30,7 @@ IF EXIST %D% GOTO FOUND_V120
 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V120\Platforms\%PLATFORM%\PlatformToolsets"\r
 IF EXIST %D% GOTO FOUND_V120\r
 \r
-:END\r
+:LOOPEND\r
 IF %SUCCESS% == 1 goto DONE\r
 echo Failed to find MSBuild toolsets directory.\r
 goto FAILED\r
@@ -75,6 +75,7 @@ copy %PLATFORM%\toolset-vs2013_xp.props %D%\LLVM-vs2013_xp\toolset.props
 IF NOT %ERRORLEVEL% == 0 GOTO FAILED\r
 copy %PLATFORM%\toolset-vs2013_xp.targets %D%\LLVM-vs2013_xp\toolset.targets\r
 IF NOT %ERRORLEVEL% == 0 GOTO FAILED\r
+set SUCCESS=1\r
 GOTO START\r
 \r
 \r