diff options
| author | Liming Gao <liming.gao@intel.com> | 2017-11-23 00:26:09 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2017-11-29 16:03:12 +0800 |
| commit | 7dddedc8b28134af84b189c9b455779e4cf1a2f0 (patch) | |
| tree | 87ebacdaa7491a6a29e746ab2222429959b51188 /BaseTools/get_vsvars.bat | |
| parent | 1d0d15522ac67393b49a5d4234654dd503975267 (diff) | |
| download | edk2-7dddedc8b28134af84b189c9b455779e4cf1a2f0.tar.gz edk2-7dddedc8b28134af84b189c9b455779e4cf1a2f0.tar.bz2 edk2-7dddedc8b28134af84b189c9b455779e4cf1a2f0.zip | |
BaseTools: Update VS batch file to auto detect VS2017
This way depends on VS vswhere.exe to find VS2017 installed directory.
vswhere.exe starts in Visual Studio 2017 version 15.2.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools/get_vsvars.bat')
| -rw-r--r-- | BaseTools/get_vsvars.bat | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat index 7649e1dccf..ba3e54d588 100644 --- a/BaseTools/get_vsvars.bat +++ b/BaseTools/get_vsvars.bat @@ -16,6 +16,12 @@ @echo off
goto :main
+:set_vsvars
+for /f "usebackq tokens=1* delims=: " %%i in (`%*`) do (
+ if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
+)
+goto :EOF
+
:read_vsvars
@rem Do nothing if already found, otherwise call vsvars32.bat if there
if defined VCINSTALLDIR goto :EOF
@@ -33,6 +39,8 @@ 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%"
|