X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Fget_vsvars.bat;h=3beb113be296cfbc7b220b62cc3a1870e01f9103;hb=1c761011340d830a2bf66128325a686ffff3f5e9;hp=9b5e9d24fcc4020c447c116460692a329ba42ce8;hpb=2e351cbe8e190271b3716284fc1076551d005472;p=mirror_edk2.git

diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat
index 9b5e9d24fc..3beb113be2 100644
--- a/BaseTools/get_vsvars.bat
+++ b/BaseTools/get_vsvars.bat
@@ -8,12 +8,23 @@
 
 
 @echo off
-goto  :main
+set SCRIPT_ERROR=0
+if "%1"=="" goto main
+if /I "%1"=="VS2019" goto VS2019Vars
+if /I "%1"=="VS2017" goto VS2017Vars
+if /I "%1"=="VS2015" goto VS2015Vars
+if /I "%1"=="VS2013" goto VS2013Vars
+if /I "%1"=="VS2012" goto VS2012Vars
 
 :set_vsvars
-for /f "usebackq tokens=1* delims=: " %%i in (`%*`) do (
-  if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
-)
+if defined VCINSTALLDIR goto :EOF
+  call %* > vswhereInfo
+  for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
+    if /i "%%i"=="installationPath" (
+      call "%%j\VC\Auxiliary\Build\vcvars32.bat"
+    )
+  )
+  del vswhereInfo
 goto :EOF
 
 :read_vsvars
@@ -26,6 +37,10 @@ if defined VCINSTALLDIR goto :EOF
 goto :EOF
 
 
+:ToolNotInstall
+set SCRIPT_ERROR=1
+goto :EOF
+
 REM NOTE: This file will find the most recent Visual Studio installation
 REM       apparent from the environment.
 REM       To use an older version, modify your environment set up.
@@ -33,11 +48,49 @@ REM       (Or invoke the relevant vsvars32 file beforehand).
 
 :main
 if defined VCINSTALLDIR goto :done
-  if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"  call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-  if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"       call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"
-  if defined VS140COMNTOOLS  call :read_vsvars  "%VS140COMNTOOLS%"
-  if defined VS120COMNTOOLS  call :read_vsvars  "%VS120COMNTOOLS%"
-  if defined VS110COMNTOOLS  call :read_vsvars  "%VS110COMNTOOLS%"
+  :VS2019Vars
+  if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" (
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17
+    ) else (
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17
+    )
+  )
+  if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" (
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17
+    ) else (
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17
+    )
+  )
+  if /I "%1"=="VS2019" goto ToolNotInstall
+
+  :VS2017Vars
+  if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16
+    ) else (
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16
+    )
+  )
+  if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16
+    ) else (
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16
+    )
+  )
+  if /I "%1"=="VS2017" goto ToolNotInstall
+
+  :VS2015Vars
+  if defined VS140COMNTOOLS (call :read_vsvars  "%VS140COMNTOOLS%") else (if /I "%1"=="VS2015" goto ToolNotInstall)
+
+  :VS2013Vars
+  if defined VS120COMNTOOLS ( call :read_vsvars  "%VS120COMNTOOLS%") else (if /I "%1"=="VS2013" goto ToolNotInstall)
+
+  :VS2012Vars
+  if defined VS110COMNTOOLS (call :read_vsvars  "%VS110COMNTOOLS%") else (if /I "%1"=="VS2012" goto ToolNotInstall)
+
   if defined VS100COMNTOOLS  call :read_vsvars  "%VS100COMNTOOLS%"
   if defined VS90COMNTOOLS   call :read_vsvars  "%VS90COMNTOOLS%"
   if defined VS80COMNTOOLS   call :read_vsvars  "%VS80COMNTOOLS%"