From: Hans Wennborg Date: Thu, 10 Oct 2013 17:31:54 +0000 (+0000) Subject: Fix msbuild integration install script. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a24c7d4e78ade068e60cbb95adb5021014ba0b7;p=oota-llvm.git Fix msbuild integration install script. We previously failed to check whether the SUCCESS variable was set, and would thus always exit with a failure if vs2012 didn't exist. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192370 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/msbuild/install.bat b/tools/msbuild/install.bat index 2b66a6c01ae..fb00d277b9c 100644 --- a/tools/msbuild/install.bat +++ b/tools/msbuild/install.bat @@ -18,8 +18,9 @@ IF EXIST %D% GOTO FOUND_V110 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms\Win32\PlatformToolsets" IF EXIST %D% GOTO FOUND_V110 -IF NOT SUCCESS == 1 echo Failed to find MSBuild toolsets directory. -IF NOT SUCCESS == 1 goto FAILED +IF %SUCCESS% == 1 goto DONE +echo Failed to find MSBuild toolsets directory. +goto FAILED :FOUND_V100 @@ -45,6 +46,8 @@ copy Microsoft.Cpp.Win32.LLVM-vs2012_xp.props %D%\LLVM-vs2012_xp IF NOT %ERRORLEVEL% == 0 GOTO FAILED copy Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets %D%\LLVM-vs2012_xp IF NOT %ERRORLEVEL% == 0 GOTO FAILED + +:DONE echo Done! goto END