diff options
| author | Joey Vagedes <joeyvagedes@microsoft.com> | 2023-02-16 05:54:16 +0000 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-02-16 18:54:33 +0000 |
| commit | 02fcfdce1e5ce86f1951191883e7e30de5aa08be (patch) | |
| tree | a099c38ef1b515dc7d2ce6f7617c6a5221c928b4 | |
| parent | 5c551d6d912967ada3084033acea8acf37256043 (diff) | |
| download | edk2-02fcfdce1e5ce86f1951191883e7e30de5aa08be.tar.gz edk2-02fcfdce1e5ce86f1951191883e7e30de5aa08be.tar.bz2 edk2-02fcfdce1e5ce86f1951191883e7e30de5aa08be.zip | |
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>
| -rw-r--r-- | BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py | 16 | ||||
| -rw-r--r-- | pip-requirements.txt | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py index 0fba2c1b53..615b5ed6d1 100644 --- a/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py +++ b/BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py @@ -177,15 +177,23 @@ class WindowsVsToolChain(IUefiBuildPlugin): def _get_vs_install_path(self, vs_version, varname):
# 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):
# Not specified...find latest
- (rc, path) = FindWithVsWhere(vs_version=vs_version)
- if rc == 0 and path is not None and os.path.exists(path):
+ try:
+ 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)
else:
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
def _get_vc_version(self, path, varname):
diff --git a/pip-requirements.txt b/pip-requirements.txt index 4ffcadddd8..3c3bf921dd 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -12,8 +12,8 @@ # https://www.python.org/dev/peps/pep-0440/#version-specifiers
##
-edk2-pytool-library==0.12.1
-edk2-pytool-extensions~=0.20.0
+edk2-pytool-library==0.14.0
+edk2-pytool-extensions~=0.21.8
edk2-basetools==0.1.39
antlr4-python3-runtime==4.7.1
lcov-cobertura==2.0.2
|