X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=61ebf4ae09bc64fc67d03f9bb22215d8270da46e;hb=2f524a745e23e1b4c73ea22b058492bfe4af84c2;hp=23dae40b209489243fdebe61a3c2636c008941ee;hpb=2e351cbe8e190271b3716284fc1076551d005472;p=mirror_edk2.git

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 23dae40b20..61ebf4ae09 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
@@ -11,6 +11,7 @@
 
 @echo off
 pushd .
+set SCRIPT_ERROR=0
 
 @REM ##############################################################
 @REM # You should not have to modify anything below this line
@@ -26,14 +27,6 @@ if /I "%1"=="/?" goto Usage
 
 :loop
   if "%1"=="" goto setup_workspace
-  if /I "%1"=="--nt32" (
-    if /I "%2" == "X64" (
-      shift
-    )
-    @REM Ignore --nt32 flag
-    shift
-    goto loop
-  )
   if /I "%1"=="Reconfig" (
     shift
     set RECONFIG=TRUE
@@ -49,6 +42,36 @@ 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
+    set VSTool=VS2017
+    goto loop
+  )
+  if /I "%1"=="VS2015" (
+    shift
+    set VS2015=TRUE
+    set VSTool=VS2015
+    goto loop
+  )
+  if /I "%1"=="VS2013" (
+    shift
+    set VS2013=TRUE
+    set VSTool=VS2013
+    goto loop
+  )
+  if /I "%1"=="VS2012" (
+    shift
+    set VS2012=TRUE
+    set VSTool=VS2012
+    goto loop
+  )
   if "%1"=="" goto setup_workspace
   if exist %1 (
     if not defined BASE_TOOLS_PATH (
@@ -159,7 +182,29 @@ IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (
   @echo.
   goto end
 )
-call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
+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
+  call %EDK_TOOLS_PATH%\get_vsvars.bat VS2015
+) else if defined VS2013 (
+  call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2013
+  call %EDK_TOOLS_PATH%\get_vsvars.bat VS2013
+) else if defined VS2012 (
+  call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat VS2012
+  call %EDK_TOOLS_PATH%\get_vsvars.bat VS2012
+) else (
+  call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat
+  call %EDK_TOOLS_PATH%\get_vsvars.bat
+)
+if %SCRIPT_ERROR% NEQ 0 (
+  @echo.
+  @echo !!! ERROR !!! %VSTool% is not installed !!!
+  @echo.
+  goto end
+)
 
 if not defined CONF_PATH (
   set CONF_PATH=%WORKSPACE%\Conf
@@ -373,7 +418,7 @@ goto end
       goto end
     )
   )
-  call "%EDK_TOOLS_PATH%\get_vsvars.bat"
+
   if not defined VCINSTALLDIR (
     @echo.
     @echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!
@@ -407,7 +452,7 @@ goto end
 
 :Usage
   @echo.
-  echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]"
+  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.
@@ -416,11 +461,22 @@ goto end
   @echo         ForceRebuild      If sources are available, rebuild all tools regardless of
   @echo                           whether they have been updated or not.
   @echo         Reconfig          Reinstall target.txt, tools_def.txt and build_rule.txt.
+  @echo         VS2012            Set the env for VS2012 build.
+  @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=
+set VS2012=
+set VSTool=
 popd