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>

1 files changed, 13 insertions, 3 deletions

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 395694f..61ebf4a 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.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) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

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

 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>

 @REM

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

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

     goto loop

   )

+  if /I "%1"=="VS2019" (

+    shift

+    set VS2019=TRUE

+    set VSTool=VS2019

+    goto loop

+  )

   if /I "%1"=="VS2017" (

     shift

     set VS2017=TRUE

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

   goto end

 )

-if defined VS2017 (

+if defined VS2019 (

+  call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2019

+) else if defined VS2017 (

   call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2017

 ) else if defined VS2015 (

   call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2015

@@ -444,7 +452,7 @@ goto end
 

 :Usage

   @echo.

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

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

   @echo.

   @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path.

   @echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.

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

   @echo         VS2015            Set the env for VS2015 build.

   @echo         VS2017            Set the env for VS2017 build.

+  @echo         VS2019            Set the env for VS2019 build.

   @echo.

 

 :end

 set REBUILD=

 set FORCE_REBUILD=

 set RECONFIG=

+set VS2019=

 set VS2017=

 set VS2015=

 set VS2013=