tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Update WindowsVsToolChain plugin 

This patch updates edk2-pytool-library dependency to v0.14.0, which has
an interface change to FindWithVsWhere. The BaseTools plugin uses this
function, so it is being updated to account for the interface change.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Signed-off-by: Joey Vagedes <joeyvagedes@microsoft.com>
Acked-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Joey Vagedes 2023-02-16 05:54:16 +00:00 committed by mergify[bot]
parent 5c551d6d91
commit 02fcfdce1e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py
View File

@ -177,15 +177,23 @@ class WindowsVsToolChain(IUefiBuildPlugin):
def _get_vs_install_path(self, vs_version, varname): def _get_vs_install_path(self, vs_version, varname):
# check if already specified # check if already specified
path = shell_environment.GetEnvironment().get_shell_var(varname) path = None
if varname is not None:
path = shell_environment.GetEnvironment().get_shell_var(varname)
if(path is None): if(path is None):
# Not specified...find latest # Not specified...find latest
(rc, path) = FindWithVsWhere(vs_version=vs_version) try:
if rc == 0 and path is not None and os.path.exists(path): path = FindWithVsWhere(vs_version=vs_version)
except (EnvironmentError, ValueError, RuntimeError) as e:
self.Logger.error(str(e))
return None
if path is not None and os.path.exists(path):
self.Logger.debug("Found VS instance for %s", vs_version) self.Logger.debug("Found VS instance for %s", vs_version)
else: else:
self.Logger.error( self.Logger.error(
"Failed to find VS instance with VsWhere (%d)" % rc) f"VsWhere successfully executed, but could not find VS instance for {vs_version}.")
return path return path
def _get_vc_version(self, path, varname): def _get_vc_version(self, path, varname):

4
pip-requirements.txt
View File

@ -12,8 +12,8 @@
# https://www.python.org/dev/peps/pep-0440/#version-specifiers # https://www.python.org/dev/peps/pep-0440/#version-specifiers
## ##
edk2-pytool-library==0.12.1 edk2-pytool-library==0.14.0
edk2-pytool-extensions~=0.20.0 edk2-pytool-extensions~=0.21.8
edk2-basetools==0.1.39 edk2-basetools==0.1.39
antlr4-python3-runtime==4.7.1 antlr4-python3-runtime==4.7.1
lcov-cobertura==2.0.2 lcov-cobertura==2.0.2