[llvm] r204629 - VS integration installer: set SUCCESS=1 if we find VS 2013

Hans Wennborg hans at hanshq.net
Mon Mar 24 10:33:23 PDT 2014


Author: hans
Date: Mon Mar 24 12:33:22 2014
New Revision: 204629

URL: http://llvm.org/viewvc/llvm-project?rev=204629&view=rev
Log:
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.

Modified:
    llvm/trunk/tools/msbuild/install.bat

Modified: llvm/trunk/tools/msbuild/install.bat
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/msbuild/install.bat?rev=204629&r1=204628&r2=204629&view=diff
==============================================================================
--- llvm/trunk/tools/msbuild/install.bat (original)
+++ llvm/trunk/tools/msbuild/install.bat Mon Mar 24 12:33:22 2014
@@ -8,7 +8,7 @@ cd /d %~dp0
 
 set PLATFORM=None
 :START
-IF %PLATFORM% == x64 GOTO END
+IF %PLATFORM% == x64 GOTO LOOPEND
 IF %PLATFORM% == Win32 SET PLATFORM=x64
 IF %PLATFORM% == None SET PLATFORM=Win32
 
@@ -30,7 +30,7 @@ IF EXIST %D% GOTO FOUND_V120
 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V120\Platforms\%PLATFORM%\PlatformToolsets"
 IF EXIST %D% GOTO FOUND_V120
 
-:END
+:LOOPEND
 IF %SUCCESS% == 1 goto DONE
 echo Failed to find MSBuild toolsets directory.
 goto FAILED
@@ -75,6 +75,7 @@ copy %PLATFORM%\toolset-vs2013_xp.props
 IF NOT %ERRORLEVEL% == 0 GOTO FAILED
 copy %PLATFORM%\toolset-vs2013_xp.targets %D%\LLVM-vs2013_xp\toolset.targets
 IF NOT %ERRORLEVEL% == 0 GOTO FAILED
+set SUCCESS=1
 GOTO START
 
 





More information about the llvm-commits mailing list