summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Vagedes <joeyvagedes@microsoft.com>2023-10-27 08:15:51 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-10-28 14:59:29 +0000
commit7806713f00e92b37799ef920daae3ebf14c5b07f (patch)
tree7367a066b4569068370697354aeb626c1590c4fd
parent7f5c24ad35419d4779f6f61c891b9bb0da5a41b1 (diff)
downloadedk2-7806713f00e92b37799ef920daae3ebf14c5b07f.tar.gz
edk2-7806713f00e92b37799ef920daae3ebf14c5b07f.tar.bz2
edk2-7806713f00e92b37799ef920daae3ebf14c5b07f.zip
BaseTools: Plugin: Integration of edk2-pytools
Performs Integration instructions necessary to upgrade edk2-pytool-library to 0.19.3 and edk2-pytool-extensions to 0.25.1. This includes resolving the deprecation of builder.mws and replacing it with builder.edk2path functionality. Cc: Sean Brogan <sean.brogan@microsoft.com> Cc: Michael Kubacki <mikuback@linux.microsoft.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Signed-off-by: Joey Vagedes <joeyvagedes@gmail.com> Message-Id: <20231027151551.1043941-3-joeyvagedes@microsoft.com> Reviewed-by: Rebecca Cran <rebecca@os.amperecomputing.com> Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
-rw-r--r--BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py b/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py
index b154466602..aa3a2bbcab 100644
--- a/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py
+++ b/BaseTools/Plugin/DebugMacroCheck/BuildPlugin/DebugMacroCheckBuildPlugin.py
@@ -58,12 +58,12 @@ class DebugMacroCheckBuildPlugin(IUefiBuildPlugin):
if "no-target" in build_target:
return 0
- pp = builder.pp.split(os.pathsep)
- edk2 = Edk2Path(builder.ws, pp)
+ edk2 = builder.edk2path
package = edk2.GetContainingPackage(
- builder.mws.join(builder.ws,
- builder.env.GetValue(
- "ACTIVE_PLATFORM")))
+ builder.edk2path.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
+ builder.env.GetValue("ACTIVE_PLATFORM")
+ )
+ )
package_path = Path(
edk2.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
package))