diff options
| author | Cheng, Ching JenX <ching.jenx.cheng@intel.com> | 2019-09-19 16:52:26 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2019-09-23 22:42:41 +0800 |
| commit | 670c903a68f214463f12c0c9619c162a0f342518 (patch) | |
| tree | 7239e4b3aa21748c979fc32f6ef1df11794b8b22 /edksetup.bat | |
| parent | 7a25b3da78444c2400a5be6555b2735de2d4acb0 (diff) | |
| download | edk2-670c903a68f214463f12c0c9619c162a0f342518.tar.gz | |
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>
Diffstat (limited to 'edksetup.bat')
| -rwxr-xr-x | edksetup.bat | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/edksetup.bat b/edksetup.bat index 5f6028deff..024f57a4b7 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -1,7 +1,7 @@ @REM @file
@REM Windows batch file to setup a WORKSPACE environment
@REM
-@REM Copyright (c) 2006 - 2016, 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 SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@@ -133,6 +133,7 @@ if defined CYGWIN_HOME ( :cygwin_done
if /I "%1"=="Rebuild" shift
if /I "%1"=="ForceRebuild" shift
+if /I "%1"=="VS2019" shift
if /I "%1"=="VS2017" shift
if /I "%1"=="VS2015" shift
if /I "%1"=="VS2013" shift
@@ -141,7 +142,7 @@ if "%1"=="" goto end :Usage
@echo.
- @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild] [VS2017] [VS2015] [VS2013] [VS2012]"
+ @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild] [VS2019] [VS2017] [VS2015] [VS2013] [VS2012]"
@echo.
@echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt.
@echo Rebuild Perform incremental rebuild of BaseTools binaries.
@@ -150,6 +151,7 @@ if "%1"=="" 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.
@echo Note that target.template, tools_def.template and build_rules.template
@echo will only be copied to target.txt, tools_def.txt and build_rule.txt
|