Reviewed-by: Bob Feng <bob.c.f...@intel.com> -----Original Message----- From: Gao, Liming <liming....@intel.com> Sent: Thursday, August 13, 2020 2:41 PM To: devel@edk2.groups.io Cc: Feng, Bob C <bob.c.f...@intel.com>; Chen, Christine <yuwei.c...@intel.com> Subject: [Patch 1/2] BaseTools: Move VS2019 env setting after VS2017 env setting
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2896 Keep the latest VS version as the last one Signed-off-by: Liming Gao <liming....@intel.com> Cc: Bob Feng <bob.c.f...@intel.com> Cc: Yuwei Chen <yuwei.c...@intel.com> --- BaseTools/set_vsprefix_envs.bat | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat index 9966a5a4ed..38fb0eb260 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -3,7 +3,7 @@ @REM however it may be executed directly from the BaseTools project folder @REM if the file is not executed within a WORKSPACE\BaseTools folder. @REM -@REM Copyright (c) 2016-2019, Intel Corporation. All rights reserved.<BR> +@REM Copyright (c) 2016-2020, Intel Corporation. All rights +reserved.<BR> @REM @REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM @@ -108,45 +108,45 @@ if defined VS140COMNTOOLS ( ) if /I "%1"=="VS2015" goto SetWinDDK -:SetVS2019 -if not defined VS160COMNTOOLS ( +:SetVS2017 +if not defined VS150COMNTOOLS ( if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" ( - if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" ( - call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" ( + call "%ProgramFiles(x86)%\Microsoft Visual + Studio\Installer\vswhere.exe" -products + Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) else ( - call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo + call "%ProgramFiles(x86)%\Microsoft Visual + Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" ( - if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" ( - call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo + if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" ( + call "%ProgramFiles%\Microsoft Visual + Studio\Installer\vswhere.exe" -products + Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) else ( - call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo + call "%ProgramFiles%\Microsoft Visual + Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) ) else ( - if /I "%1"=="VS2019" goto ToolNotInstall + if /I "%1"=="VS2017" goto ToolNotInstall goto SetWinDDK ) ) if defined VCToolsInstallDir ( - if not defined VS2019_PREFIX ( - set "VS2019_PREFIX=%VCToolsInstallDir%" + if not defined VS2017_PREFIX ( + set "VS2017_PREFIX=%VCToolsInstallDir%" ) if not defined WINSDK10_PREFIX ( if defined WindowsSdkVerBinPath ( @@ -164,45 +164,45 @@ if not defined WINSDK_PATH_FOR_RC_EXE ( ) ) -:SetVS2017 -if not defined VS150COMNTOOLS ( +:SetVS2019 +if not defined VS160COMNTOOLS ( if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" ( - if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" ( - call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo + if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" ( + call "%ProgramFiles(x86)%\Microsoft Visual + Studio\Installer\vswhere.exe" -products + Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) else ( - call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo + call "%ProgramFiles(x86)%\Microsoft Visual + Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" ( - if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" ( - call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo + if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" ( + call "%ProgramFiles%\Microsoft Visual + Studio\Installer\vswhere.exe" -products + Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) else ( - call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo + call "%ProgramFiles%\Microsoft Visual + Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do ( if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat" ) del vswhereInfo ) ) else ( - if /I "%1"=="VS2017" goto ToolNotInstall + if /I "%1"=="VS2019" goto ToolNotInstall goto SetWinDDK ) ) if defined VCToolsInstallDir ( - if not defined VS2017_PREFIX ( - set "VS2017_PREFIX=%VCToolsInstallDir%" + if not defined VS2019_PREFIX ( + set "VS2019_PREFIX=%VCToolsInstallDir%" ) if not defined WINSDK10_PREFIX ( if defined WindowsSdkVerBinPath ( -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#64262): https://edk2.groups.io/g/devel/message/64262 Mute This Topic: https://groups.io/mt/76163155/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
