maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 204629
This commit is contained in:
Hans Wennborg 2014-03-24 17:33:22 +00:00
parent b768fe5ea1
commit 9c8f1a7b11
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/tools/msbuild/install.bat
View File

@ -8,7 +8,7 @@ cd /d %~dp0
set PLATFORM=None set PLATFORM=None
:START :START
IF %PLATFORM% == x64 GOTO END IF %PLATFORM% == x64 GOTO LOOPEND
IF %PLATFORM% == Win32 SET PLATFORM=x64 IF %PLATFORM% == Win32 SET PLATFORM=x64
IF %PLATFORM% == None SET PLATFORM=Win32 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" SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V120\Platforms\%PLATFORM%\PlatformToolsets"
IF EXIST %D% GOTO FOUND_V120 IF EXIST %D% GOTO FOUND_V120
:END :LOOPEND
IF %SUCCESS% == 1 goto DONE IF %SUCCESS% == 1 goto DONE
echo Failed to find MSBuild toolsets directory. echo Failed to find MSBuild toolsets directory.
goto FAILED goto FAILED
@ -75,6 +75,7 @@ copy %PLATFORM%\toolset-vs2013_xp.props %D%\LLVM-vs2013_xp\toolset.props
IF NOT %ERRORLEVEL% == 0 GOTO FAILED IF NOT %ERRORLEVEL% == 0 GOTO FAILED
copy %PLATFORM%\toolset-vs2013_xp.targets %D%\LLVM-vs2013_xp\toolset.targets copy %PLATFORM%\toolset-vs2013_xp.targets %D%\LLVM-vs2013_xp\toolset.targets
IF NOT %ERRORLEVEL% == 0 GOTO FAILED IF NOT %ERRORLEVEL% == 0 GOTO FAILED
set SUCCESS=1
GOTO START GOTO START