From: Sean Brogan <sean.bro...@microsoft.com>
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 <sean.bro...@microsoft.com>
Cc: Bob Feng <bob.c.f...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
---
.../WindowsVsToolChain/WindowsVsToolChain.py | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py
b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py
index a8202e5992..e3c4cc94a3 100644
--- a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py
+++ b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py
@@ -21,6 +21,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.
@@ -52,6 +55,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")
@@ -87,6 +100,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.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53884): https://edk2.groups.io/g/devel/message/53884
Mute This Topic: https://groups.io/mt/71036786/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
