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.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat
index 9966a5a4ed574846afc9f241447da2c75ae7b3ab..38fb0eb260658bdc79445b464997324056db5a10 100644 (file)
--- 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\r
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.\r
 @REM\r
-@REM Copyright (c) 2016-2019, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2016-2020, Intel Corporation. All rights reserved.<BR>\r
 @REM\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
@@ -108,45 +108,45 @@ if defined VS140COMNTOOLS (
 )\r
 if /I "%1"=="VS2015" goto SetWinDDK\r
 \r
-:SetVS2019\r
-if not defined VS160COMNTOOLS (\r
+:SetVS2017\r
+if not defined VS150COMNTOOLS (\r
   if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
-    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" (\r
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo\r
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (\r
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     ) else (\r
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo\r
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     )\r
   ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
-    if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" (\r
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo\r
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (\r
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     ) else (\r
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo\r
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     )\r
   ) else (\r
-    if /I "%1"=="VS2019" goto ToolNotInstall\r
+    if /I "%1"=="VS2017" goto ToolNotInstall\r
     goto SetWinDDK\r
   )\r
 )\r
 \r
 if defined VCToolsInstallDir (\r
-  if not defined VS2019_PREFIX (\r
-    set "VS2019_PREFIX=%VCToolsInstallDir%"\r
+  if not defined VS2017_PREFIX (\r
+    set "VS2017_PREFIX=%VCToolsInstallDir%"\r
   )\r
   if not defined WINSDK10_PREFIX (\r
     if defined WindowsSdkVerBinPath (\r
@@ -164,45 +164,45 @@ if not defined WINSDK_PATH_FOR_RC_EXE (
   )\r
 )\r
 \r
-:SetVS2017\r
-if not defined VS150COMNTOOLS (\r
+:SetVS2019\r
+if not defined VS160COMNTOOLS (\r
   if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
-    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (\r
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo\r
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" (\r
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     ) else (\r
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo\r
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     )\r
   ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
-    if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (\r
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo\r
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" (\r
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     ) else (\r
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo\r
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo\r
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r
       del vswhereInfo\r
     )\r
   ) else (\r
-    if /I "%1"=="VS2017" goto ToolNotInstall\r
+    if /I "%1"=="VS2019" goto ToolNotInstall\r
     goto SetWinDDK\r
   )\r
 )\r
 \r
 if defined VCToolsInstallDir (\r
-  if not defined VS2017_PREFIX (\r
-    set "VS2017_PREFIX=%VCToolsInstallDir%"\r
+  if not defined VS2019_PREFIX (\r
+    set "VS2019_PREFIX=%VCToolsInstallDir%"\r
   )\r
   if not defined WINSDK10_PREFIX (\r
     if defined WindowsSdkVerBinPath (\r