Merging r259695:

[oota-llvm.git] / tools / msbuild / uninstall.bat

diff --git a/tools/msbuild/uninstall.bat b/tools/msbuild/uninstall.bat
index b0bc943daf1ffb32cdd921ca0c26095ee98b6bbc..c1afae2c3c9694fba9169a4e41c438d75bf90772 100644 (file)
--- a/tools/msbuild/uninstall.bat
+++ b/tools/msbuild/uninstall.bat
@@ -6,8 +6,8 @@ REM CD to the directory of this batch file.
 cd /d %~dp0\r
 \r
 set PLATFORM=None\r
-:START\r
-IF %PLATFORM% == x64 GOTO END\r
+:LOOPHEAD\r
+IF %PLATFORM% == x64 GOTO LOOPEND\r
 IF %PLATFORM% == Win32 SET PLATFORM=x64\r
 IF %PLATFORM% == None SET PLATFORM=Win32\r
 \r
@@ -51,8 +51,23 @@ IF EXIST %D%\LLVM-vs2013_xp del %D%\LLVM-vs2013_xp\toolset.props
 IF EXIST %D%\LLVM-vs2013_xp del %D%\LLVM-vs2013_xp\toolset.targets\r
 IF EXIST %D%\LLVM-vs2013_xp rmdir %D%\LLVM-vs2013_xp\r
 \r
+SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\%PLATFORM%\PlatformToolsets"\r
+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.props\r
+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.targets\r
+IF EXIST %D%\LLVM-vs2014 rmdir %D%\LLVM-vs2014\r
+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.props\r
+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.targets\r
+IF EXIST %D%\LLVM-vs2014_xp rmdir %D%\LLVM-vs2014_xp\r
+SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms\%PLATFORM%\PlatformToolsets"\r
+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.props\r
+IF EXIST %D%\LLVM-vs2014 del %D%\LLVM-vs2014\toolset.targets\r
+IF EXIST %D%\LLVM-vs2014 rmdir %D%\LLVM-vs2014\r
+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.props\r
+IF EXIST %D%\LLVM-vs2014_xp del %D%\LLVM-vs2014_xp\toolset.targets\r
+IF EXIST %D%\LLVM-vs2014_xp rmdir %D%\LLVM-vs2014_xp\r
 \r
-GOTO START\r
 \r
-:END\r
+GOTO LOOPHEAD\r
+\r
+:LOOPEND\r
 echo Done!\r