BaseTools: Add new RegExp for future use

[mirror_edk2.git] / BaseTools / get_vsvars.bat

diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat
index b67a81d78052a58765c93473271475cb38f8b9bc..ba3e54d588cfb708f1cb5acb8a14a52cf1589c54 100644 (file)
--- a/BaseTools/get_vsvars.bat
+++ b/BaseTools/get_vsvars.bat
@@ -16,6 +16,12 @@
 @echo off\r
 goto  :main\r
 \r
+:set_vsvars\r
+for /f "usebackq tokens=1* delims=: " %%i in (`%*`) do (\r
+  if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
+)\r
+goto :EOF\r
+\r
 :read_vsvars\r
 @rem Do nothing if already found, otherwise call vsvars32.bat if there\r
 if defined VCINSTALLDIR goto :EOF\r
@@ -33,8 +39,9 @@ REM       (Or invoke the relevant vsvars32 file beforehand).
 \r
 :main\r
 if defined VCINSTALLDIR goto :done\r
+  if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"  call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"\r
+  if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"       call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"\r
   if defined VS140COMNTOOLS  call :read_vsvars  "%VS140COMNTOOLS%"\r
-  if defined VS130COMNTOOLS  call :read_vsvars  "%VS130COMNTOOLS%"\r
   if defined VS120COMNTOOLS  call :read_vsvars  "%VS120COMNTOOLS%"\r
   if defined VS110COMNTOOLS  call :read_vsvars  "%VS110COMNTOOLS%"\r
   if defined VS100COMNTOOLS  call :read_vsvars  "%VS100COMNTOOLS%"\r