From 1bcff6cffa30c2fdcf0eac80ef9551429b38f25d Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Fri, 6 Sep 2013 17:05:46 +0000 Subject: msbuild integration: provide separate files for VS2010 and VS2012 The previous msbuild integration only worked if VS2010 was installed. This patch renames the current integration to LLVM-vs2010 and adds LLVM-vs2012. Differential Revision: http://llvm-reviews.chandlerc.com/D1614 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190173 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/msbuild/uninstall.bat | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'tools/msbuild/uninstall.bat') diff --git a/tools/msbuild/uninstall.bat b/tools/msbuild/uninstall.bat index 8bc304e0b8..c6972397e7 100644 --- a/tools/msbuild/uninstall.bat +++ b/tools/msbuild/uninstall.bat @@ -5,30 +5,24 @@ echo Uninstalling MSVC integration... REM CD to the directory of this batch file. cd /d %~dp0 -REM Search for the MSBuild toolsets directory. SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\Platforms\Win32\PlatformToolsets" -IF EXIST %D% GOTO FOUND_MSBUILD -SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\Platforms\Win32\PlatformToolsets" -IF EXIST %D% GOTO FOUND_MSBUILD +IF EXIST %D%\LLVM-vs2010 del %D%\LLVM-vs2010\Microsoft.Cpp.Win32.LLVM-vs2010.props +IF EXIST %D%\LLVM-vs2010 del %D%\LLVM-vs2010\Microsoft.Cpp.Win32.LLVM-vs2010.targets +IF EXIST %D%\LLVM-vs2010 rmdir %D%\LLVM-vs2010 -echo Failed to find MSBuild toolsets directory. -goto FAILED +SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\Platforms\Win32\PlatformToolsets" +IF EXIST %D%\LLVM-vs2010 del %D%\LLVM-vs2010\Microsoft.Cpp.Win32.LLVM-vs2010.props +IF EXIST %D%\LLVM-vs2010 del %D%\LLVM-vs2010\Microsoft.Cpp.Win32.LLVM-vs2010.targets +IF EXIST %D%\LLVM-vs2010 rmdir %D%\LLVM-vs2010 -:FOUND_MSBUILD +SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms\Win32\PlatformToolsets" +IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.props +IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.targets +IF EXIST %D%\LLVM-vs2012 rmdir %D%\LLVM-vs2012 -del %D%\llvm\Microsoft.Cpp.Win32.llvm.props -IF NOT %ERRORLEVEL% == 0 GOTO FAILED -del %D%\llvm\Microsoft.Cpp.Win32.llvm.targets -IF NOT %ERRORLEVEL% == 0 GOTO FAILED -rmdir %D%\llvm -IF NOT %ERRORLEVEL% == 0 GOTO FAILED +SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms\Win32\PlatformToolsets" +IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.props +IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.targets +IF EXIST %D%\LLVM-vs2012 rmdir %D%\LLVM-vs2012 echo Done! -goto END - -:FAILED -echo MSVC integration uninstall failed. -pause -goto END - -:END -- cgit v1.2.3