From 3b4ad37ebef1cd3635fde821b43a0edc116b256b Mon Sep 17 00:00:00 2001 From: Sean Brogan Date: Fri, 7 Feb 2020 07:07:14 +0800 Subject: [PATCH] BaseTools/WindowsVsToolChain: Setup VS2017/VS2019 env https://bugzilla.tianocore.org/show_bug.cgi?id=2495 Update the WindowsVsToolChain plugin to setup the VS2017 or VS2019 development environment. This is required to build BaseTools and Structured PCD host applications. Cc: Sean Brogan Cc: Bob Feng Cc: Liming Gao Signed-off-by: Michael D Kinney Reviewed-by: Bob Feng --- .../WindowsVsToolChain/WindowsVsToolChain.py | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py index bcb0648c85..c9279e1c75 100644 --- a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py +++ b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py @@ -22,6 +22,9 @@ class WindowsVsToolChain(IUefiBuildPlugin): def do_pre_build(self, thebuilder): self.Logger = logging.getLogger("WindowsVsToolChain") + interesting_keys = ["ExtensionSdkDir", "INCLUDE", "LIB", "LIBPATH", "UniversalCRTSdkDir", + "UCRTVersion", "WindowsLibPath", "WindowsSdkBinPath", "WindowsSdkDir", "WindowsSdkVerBinPath", + "WindowsSDKVersion", "VCToolsInstallDir", "Path"] # # VS2017 - Follow VS2017 where there is potential for many versions of the tools. @@ -56,6 +59,16 @@ class WindowsVsToolChain(IUefiBuildPlugin): prefix = prefix + os.path.sep shell_environment.GetEnvironment().set_shell_var("VS2017_PREFIX", prefix) + shell_env = shell_environment.GetEnvironment() + # Use the tools lib to determine the correct values for the vars that interest us. + vs_vars = locate_tools.QueryVcVariables( + interesting_keys, "amd64", vs_version="vs2017") + for (k, v) in vs_vars.items(): + if k.upper() == "PATH": + shell_env.insert_path(v) + else: + shell_env.set_shell_var(k, v) + # now confirm it exists if not os.path.exists(shell_environment.GetEnvironment().get_shell_var("VS2017_PREFIX")): self.Logger.error("Path for VS2017 toolchain is invalid") @@ -94,6 +107,16 @@ class WindowsVsToolChain(IUefiBuildPlugin): prefix = prefix + os.path.sep shell_environment.GetEnvironment().set_shell_var("VS2019_PREFIX", prefix) + shell_env = shell_environment.GetEnvironment() + # Use the tools lib to determine the correct values for the vars that interest us. + vs_vars = locate_tools.QueryVcVariables( + interesting_keys, "amd64", vs_version="vs2019") + for (k, v) in vs_vars.items(): + if k.upper() == "PATH": + shell_env.insert_path(v) + else: + shell_env.set_shell_var(k, v) + # now confirm it exists if not os.path.exists(shell_environment.GetEnvironment().get_shell_var("VS2019_PREFIX")): self.Logger.error("Path for VS2019 toolchain is invalid") -- 2.39.2