summaryrefslogtreecommitdiff
path: root/tools/msbuild
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2014-03-24 17:33:22 +0000
committerHans Wennborg <hans@hanshq.net>2014-03-24 17:33:22 +0000
commit657c472bb0557631622444ef452fbbdf9c2d5029 (patch)
tree974943ef3017cb4eb6be9ebd7524a4c8b899594c /tools/msbuild
parentb6f02c13da32252b3ef2d95db8089bffd3028e0f (diff)
downloadllvm-657c472bb0557631622444ef452fbbdf9c2d5029.tar.gz
llvm-657c472bb0557631622444ef452fbbdf9c2d5029.tar.bz2
llvm-657c472bb0557631622444ef452fbbdf9c2d5029.tar.xz
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
Diffstat (limited to 'tools/msbuild')
-rw-r--r--tools/msbuild/install.bat5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/msbuild/install.bat b/tools/msbuild/install.bat
index 3b19fe76d8..9880fb27e9 100644
--- a/tools/msbuild/install.bat
+++ b/tools/msbuild/install.bat
@@ -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 %D%\LLVM-vs2013_xp\toolset.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