Skip to content

Commit

Permalink
VS integration installer: set SUCCESS=1 if we find VS 2013
Browse files Browse the repository at this point in the history
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
  • Loading branch information
zmodem committed Mar 24, 2014
1 parent b6f02c1 commit 657c472
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tools/msbuild/install.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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


Expand Down

0 comments on commit 657c472

Please sign in to comment.