Add VS2019 Support on ToolSetup Batches

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2182

Inorder to support VS2019, we add VS2019 config process
in Setup Batch Files,
Because VS2019 and VS2017 could using same vswhere.exe
to detect the InstallationPath,
So we add the -version as the parameter of vswhere
to get the correct VS2017/VS2019's InstallationPath

v3: In BaseTools\set_vsprefix_envs.bat,
    move WINSDK10_PREFIX setting into VCToolsInstallDir check condition.

Cc: Amy Chan <amy.chan@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Ching JenX Cheng <ching.jenx.cheng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Pete Batard <pete@akeo.ie>

diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat
index 9f3759b2a98c1c07fbaeeec4369c7c2b58c88c2a..3beb113be296cfbc7b220b62cc3a1870e01f9103 100644 (file)
--- a/BaseTools/get_vsvars.bat
+++ b/BaseTools/get_vsvars.bat
@@ -10,15 +10,21 @@
 @echo off\r
 set SCRIPT_ERROR=0\r
 if "%1"=="" goto main\r
 @echo off\r
 set SCRIPT_ERROR=0\r
 if "%1"=="" goto main\r

+if /I "%1"=="VS2019" goto VS2019Vars\r

 if /I "%1"=="VS2017" goto VS2017Vars\r
 if /I "%1"=="VS2015" goto VS2015Vars\r
 if /I "%1"=="VS2013" goto VS2013Vars\r
 if /I "%1"=="VS2012" goto VS2012Vars\r
 \r
 :set_vsvars\r
 if /I "%1"=="VS2017" goto VS2017Vars\r
 if /I "%1"=="VS2015" goto VS2015Vars\r
 if /I "%1"=="VS2013" goto VS2013Vars\r
 if /I "%1"=="VS2012" goto VS2012Vars\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
+if defined VCINSTALLDIR goto :EOF\r
+  call %* > vswhereInfo\r
+  for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (\r
+    if /i "%%i"=="installationPath" (\r
+      call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
+    )\r
+  )\r
+  del vswhereInfo\r

 goto :EOF\r
 \r
 :read_vsvars\r
 goto :EOF\r
 \r
 :read_vsvars\r


@@ -42,19 +48,36 @@ REM       (Or invoke the relevant vsvars32 file beforehand).
 \r
 :main\r
 if defined VCINSTALLDIR goto :done\r
 \r
 :main\r
 if defined VCINSTALLDIR goto :done\r

+  :VS2019Vars\r
+  if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" (\r
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17\r
+    ) else (\r
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17\r
+    )\r
+  )\r
+  if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" (\r
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17\r
+    ) else (\r
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17\r
+    )\r
+  )\r
+  if /I "%1"=="VS2019" goto ToolNotInstall\r
+\r

   :VS2017Vars\r
   if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
     if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (\r
   :VS2017Vars\r
   if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
     if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (\r

-      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools\r
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16\r

     ) else (\r
     ) else (\r

-      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"\r
+      call :set_vsvars "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16\r

     )\r
   )\r
   if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
     if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (\r
     )\r
   )\r
   if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
     if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (\r

-      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools\r
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16\r

     ) else (\r
     ) else (\r

-      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"\r
+      call :set_vsvars "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16\r

     )\r
   )\r
   if /I "%1"=="VS2017" goto ToolNotInstall\r
     )\r
   )\r
   if /I "%1"=="VS2017" goto ToolNotInstall\r

diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat
index 81686f5b63ad0dd836757e7e455a58a2cd98b46d..6dff25d93009b9cbcf44070c7f325a91b7957a3d 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   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-2017, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2016-2019, Intel Corporation. All rights reserved.<BR>\r

 @REM\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
 @REM\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r


@@ -18,6 +18,7 @@ set SCRIPT_ERROR=1
 goto :EOF\r
 \r
 :main\r
 goto :EOF\r
 \r
 :main\r

+if /I "%1"=="VS2019" goto SetVS2019\r

 if /I "%1"=="VS2017" goto SetVS2017\r
 if /I "%1"=="VS2015" goto SetVS2015\r
 if /I "%1"=="VS2013" goto SetVS2013\r
 if /I "%1"=="VS2017" goto SetVS2017\r
 if /I "%1"=="VS2015" goto SetVS2015\r
 if /I "%1"=="VS2013" goto SetVS2013\r


@@ -107,27 +108,86 @@ if defined VS140COMNTOOLS (
 )\r
 if /I "%1"=="VS2015" goto SetWinDDK\r
 \r
 )\r
 if /I "%1"=="VS2015" goto SetWinDDK\r
 \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\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 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\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 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"=="VS2019" goto ToolNotInstall\r
+    goto SetWinDDK\r
+  )\r
+)\r
+\r
+if defined VCToolsInstallDir (\r
+  if not defined VS2019_PREFIX (\r
+    set "VS2019_PREFIX=%VCToolsInstallDir%"\r
+  )\r
+  if not defined WINSDK10_PREFIX (\r
+    if defined WindowsSdkVerBinPath (\r
+      set "WINSDK10_PREFIX=%WindowsSdkVerBinPath%"\r
+    ) else if exist "%ProgramFiles(x86)%\Windows Kits\10\bin" (\r
+      set "WINSDK10_PREFIX=%ProgramFiles(x86)%\Windows Kits\10\bin\"\r
+    ) else if exist "%ProgramFiles%\Windows Kits\10\bin" (\r
+      set "WINSDK10_PREFIX=%ProgramFiles%\Windows Kits\10\bin\"\r
+    )\r
+  )\r
+)\r
+\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\2017\BuildTools" (\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\2017\BuildTools" (\r

-      for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools`) do (\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
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r

+      del vswhereInfo\r

     ) else (\r
     ) else (\r

-      for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`) do (\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
         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
     )\r
   ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (\r
     if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (\r

-      for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools`) do (\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
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"\r
       )\r

+      del vswhereInfo\r

     ) else (\r
     ) else (\r

-      for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"`) do (\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
         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
     )\r
   ) else (\r
     if /I "%1"=="VS2017" goto ToolNotInstall\r


@@ -139,14 +199,14 @@ if defined VCToolsInstallDir (
   if not defined VS2017_PREFIX (\r
     set "VS2017_PREFIX=%VCToolsInstallDir%"\r
   )\r
   if not defined VS2017_PREFIX (\r
     set "VS2017_PREFIX=%VCToolsInstallDir%"\r
   )\r

-)\r
-if not defined WINSDK10_PREFIX (\r
-  if defined WindowsSdkVerBinPath (\r
-    set "WINSDK10_PREFIX=%WindowsSdkVerBinPath%"\r
-  ) else if exist "%ProgramFiles(x86)%\Windows Kits\10\bin" (\r
-    set "WINSDK10_PREFIX=%ProgramFiles(x86)%\Windows Kits\10\bin\"\r
-  ) else if exist "%ProgramFiles%\Windows Kits\10\bin" (\r
-    set "WINSDK10_PREFIX=%ProgramFiles%\Windows Kits\10\bin\"\r
+  if not defined WINSDK10_PREFIX (\r
+    if defined WindowsSdkVerBinPath (\r
+      set "WINSDK10_PREFIX=%WindowsSdkVerBinPath%"\r
+    ) else if exist "%ProgramFiles(x86)%\Windows Kits\10\bin" (\r
+      set "WINSDK10_PREFIX=%ProgramFiles(x86)%\Windows Kits\10\bin\"\r
+    ) else if exist "%ProgramFiles%\Windows Kits\10\bin" (\r
+      set "WINSDK10_PREFIX=%ProgramFiles%\Windows Kits\10\bin\"\r
+    )\r

   )\r
 )\r
 \r
   )\r
 )\r
 \r

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 395694fa090a949a51dde8611c9cd430f16c2624..61ebf4ae09bc64fc67d03f9bb22215d8270da46e 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.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   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) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r

 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r


@@ -42,6 +42,12 @@ if /I "%1"=="/?" goto Usage
     set FORCE_REBUILD=TRUE\r
     goto loop\r
   )\r
     set FORCE_REBUILD=TRUE\r
     goto loop\r
   )\r

+  if /I "%1"=="VS2019" (\r
+    shift\r
+    set VS2019=TRUE\r
+    set VSTool=VS2019\r
+    goto loop\r
+  )\r

   if /I "%1"=="VS2017" (\r
     shift\r
     set VS2017=TRUE\r
   if /I "%1"=="VS2017" (\r
     shift\r
     set VS2017=TRUE\r


@@ -176,7 +182,9 @@ IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (
   @echo.\r
   goto end\r
 )\r
   @echo.\r
   goto end\r
 )\r

-if defined VS2017 (\r
+if defined VS2019 (\r
+  call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2019\r
+) else if defined VS2017 (\r

   call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2017\r
 ) else if defined VS2015 (\r
   call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2015\r
   call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2017\r
 ) else if defined VS2015 (\r
   call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2015\r


@@ -444,7 +452,7 @@ goto end
 \r
 :Usage\r
   @echo.\r
 \r
 :Usage\r
   @echo.\r

-  echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2017] [VS2015] [VS2013] [VS2012]"\r
+  echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]"\r

   @echo.\r
   @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path.\r
   @echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.\r
   @echo.\r
   @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path.\r
   @echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.\r


@@ -457,12 +465,14 @@ goto end
   @echo         VS2013            Set the env for VS2013 build.\r
   @echo         VS2015            Set the env for VS2015 build.\r
   @echo         VS2017            Set the env for VS2017 build.\r
   @echo         VS2013            Set the env for VS2013 build.\r
   @echo         VS2015            Set the env for VS2015 build.\r
   @echo         VS2017            Set the env for VS2017 build.\r

+  @echo         VS2019            Set the env for VS2019 build.\r

   @echo.\r
 \r
 :end\r
 set REBUILD=\r
 set FORCE_REBUILD=\r
 set RECONFIG=\r
   @echo.\r
 \r
 :end\r
 set REBUILD=\r
 set FORCE_REBUILD=\r
 set RECONFIG=\r

+set VS2019=\r

 set VS2017=\r
 set VS2015=\r
 set VS2013=\r
 set VS2017=\r
 set VS2015=\r
 set VS2013=\r

diff --git a/edksetup.bat b/edksetup.bat
index 5f6028deffb7cf211ed84dd7330331d73d40ef87..024f57a4b739a2e7ce6c065ae56b0fbea3d9adae 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,7 @@
 @REM @file\r
 @REM   Windows batch file to setup a WORKSPACE environment\r
 @REM\r
 @REM @file\r
 @REM   Windows batch file to setup a WORKSPACE environment\r
 @REM\r

-@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r

 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r


@@ -133,6 +133,7 @@ if defined CYGWIN_HOME (
 :cygwin_done\r
 if /I "%1"=="Rebuild" shift\r
 if /I "%1"=="ForceRebuild" shift\r
 :cygwin_done\r
 if /I "%1"=="Rebuild" shift\r
 if /I "%1"=="ForceRebuild" shift\r

+if /I "%1"=="VS2019" shift\r

 if /I "%1"=="VS2017" shift\r
 if /I "%1"=="VS2015" shift\r
 if /I "%1"=="VS2013" shift\r
 if /I "%1"=="VS2017" shift\r
 if /I "%1"=="VS2015" shift\r
 if /I "%1"=="VS2013" shift\r


@@ -141,7 +142,7 @@ if "%1"=="" goto end
 \r
 :Usage\r
   @echo.\r
 \r
 :Usage\r
   @echo.\r

-  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild] [VS2017] [VS2015] [VS2013] [VS2012]"\r
+  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]"\r

   @echo.\r
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
   @echo         Rebuild        Perform incremental rebuild of BaseTools binaries.\r
   @echo.\r
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
   @echo         Rebuild        Perform incremental rebuild of BaseTools binaries.\r


@@ -150,6 +151,7 @@ if "%1"=="" goto end
   @echo         VS2013         Set the env for VS2013 build.\r
   @echo         VS2015         Set the env for VS2015 build.\r
   @echo         VS2017         Set the env for VS2017 build.\r
   @echo         VS2013         Set the env for VS2013 build.\r
   @echo         VS2015         Set the env for VS2015 build.\r
   @echo         VS2017         Set the env for VS2017 build.\r

+  @echo         VS2019         Set the env for VS2019 build.\r

   @echo.\r
   @echo  Note that target.template, tools_def.template and build_rules.template\r
   @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt\r
   @echo.\r
   @echo  Note that target.template, tools_def.template and build_rules.template\r
   @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt\r