.pytool: Update to newest pytools

Update to the newest pytools and resolves the API change for
GetAbsolutePathOnThisSytemFromEdk2RelativePath

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>

diff --git a/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py b/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py
index 1496e1f24934187cedd080caddbb4883857c9a37..b09fb17040875129860a244e16156796cff10544 100644 (file)
--- a/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py
+++ b/.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py
@@ -69,7 +69,7 @@ class CharEncodingCheck(ICiBuildPlugin):
         overall_status = 0\r
         files_tested = 0\r
 \r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename)\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)\r
 \r
         if abs_pkg_path is None:\r
             tc.SetSkipped()\r
@@ -90,7 +90,7 @@ class CharEncodingCheck(ICiBuildPlugin):
                         tc.LogStdError("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem.  Invalid ignore file".format(a))\r
                         logging.info("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem.  Invalid ignore file".format(a))\r
 \r
-            files = [Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(x) for x in files]\r
+            files = [Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(x) for x in files]\r
             for a in files:\r
                 files_tested += 1\r
                 if(self.TestEncodingOk(a, enc)):\r

diff --git a/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py b/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py
index e8657940d71bae72d9c2b34f615ebc8fd9611849..3cf3888828c071a86e1afb57f5d8f263dd2e8948 100644 (file)
--- a/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py
+++ b/.pytool/Plugin/CompilerPlugin/CompilerPlugin.py
@@ -61,7 +61,7 @@ class CompilerPlugin(ICiBuildPlugin):
             tc.LogStdError("DscPath not found in config file.  Nothing to compile.")\r
             return -1\r
 \r
-        AP = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename)\r
+        AP = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)\r
 \r
         APDSC = os.path.join(AP, pkgconfig["DscPath"].strip())\r
         AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC)\r

diff --git a/.pytool/Plugin/DependencyCheck/DependencyCheck.py b/.pytool/Plugin/DependencyCheck/DependencyCheck.py
index db154d769a3909eeacb4781322a43b65a06ffa46..07c5682d95d3ca48f5a34a5abc3c2e26bc13087c 100644 (file)
--- a/.pytool/Plugin/DependencyCheck/DependencyCheck.py
+++ b/.pytool/Plugin/DependencyCheck/DependencyCheck.py
@@ -55,7 +55,7 @@ class DependencyCheck(ICiBuildPlugin):
         overall_status = 0\r
 \r
         # Get current platform\r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename)\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)\r
 \r
         # Get INF Files\r
         INFFiles = self.WalkDirectoryForExtension([".inf"], abs_pkg_path)\r

diff --git a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py b/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py
index c613cd52334cd1bea7093cf77c3680258409e49d..351137c5e4b7b3f022c22753f10be819176f66fe 100644 (file)
--- a/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py
+++ b/.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py
@@ -58,7 +58,7 @@ class DscCompleteCheck(ICiBuildPlugin):
                 "DscPath not found in config file.  Nothing to check.")\r
             return -1\r
 \r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(\r
             packagename)\r
         abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip())\r
         wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(\r

diff --git a/.pytool/Plugin/GuidCheck/GuidCheck.py b/.pytool/Plugin/GuidCheck/GuidCheck.py
index 61fdc7791128584df2143af9fd9bc8df13d3147d..7e17a648a432139db5677244f3c63fbb9208a33c 100644 (file)
--- a/.pytool/Plugin/GuidCheck/GuidCheck.py
+++ b/.pytool/Plugin/GuidCheck/GuidCheck.py
@@ -116,7 +116,7 @@ class GuidCheck(ICiBuildPlugin):
     def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None):\r
         Errors = []\r
 \r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(\r
             packagename)\r
 \r
         if abs_pkg_path is None:\r

diff --git a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py
index f21b40caf291838f5f8cda728051c37151242e46..76e3392ba1792830555977b4b5b135d94d68bb72 100644 (file)
--- a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py
+++ b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py
@@ -93,7 +93,7 @@ class HostUnitTestCompilerPlugin(ICiBuildPlugin):
             tc.LogStdError("DscPath not found in config file.  Nothing to compile for HostBasedUnitTests.")\r
             return -1\r
 \r
-        AP = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename)\r
+        AP = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)\r
 \r
         APDSC = os.path.join(AP, pkgconfig["DscPath"].strip())\r
         AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC)\r

diff --git a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
index 66bdecacfbc2476d44f9c97c97c106ded2176f8b..8a8883edf4a9357cbc4297abfaa32e115f40cb45 100644 (file)
--- a/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
+++ b/.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
@@ -61,7 +61,7 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin):
                 "DscPath not found in config file.  Nothing to check.")\r
             return -1\r
 \r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(\r
             packagename)\r
         abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip())\r
         wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(\r

diff --git a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py
index 20d87f13f5240613bc47b9d98339ac4f24545ac3..1a38d802ef5ddb1d8632a4b48e85baebadf88703 100644 (file)
--- a/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py
+++ b/.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py
@@ -63,7 +63,7 @@ class LibraryClassCheck(ICiBuildPlugin):
         overall_status = 0\r
         LibraryClassIgnore = []\r
 \r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename)\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)\r
         abs_dec_path = self.__GetPkgDec(abs_pkg_path)\r
         wsr_dec_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(abs_dec_path)\r
 \r

diff --git a/.pytool/Plugin/SpellCheck/SpellCheck.py b/.pytool/Plugin/SpellCheck/SpellCheck.py
index 05c471d91ba12e946a03b904b49de139ca371ae5..8347fa990042c6254b90b5d181c87db4dc52950c 100644 (file)
--- a/.pytool/Plugin/SpellCheck/SpellCheck.py
+++ b/.pytool/Plugin/SpellCheck/SpellCheck.py
@@ -73,7 +73,7 @@ class SpellCheck(ICiBuildPlugin):
     def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None):\r
         Errors = []\r
 \r
-        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(\r
+        abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(\r
             packagename)\r
 \r
         if abs_pkg_path is None:\r

diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
index ea8396942b16a461e0b8b8d9926bec664b250a81..82db7a5a438b6a8e589041fca24c4c651cbd45d1 100644 (file)
--- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
+++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
@@ -421,7 +421,7 @@ class UncrustifyCheck(ICiBuildPlugin):
         """\r
         Initializes plugin environment information.\r
         """\r
-        self._abs_package_path = edk2_path.GetAbsolutePathOnThisSytemFromEdk2RelativePath(\r
+        self._abs_package_path = edk2_path.GetAbsolutePathOnThisSystemFromEdk2RelativePath(\r
             package_rel_path)\r
         self._abs_workspace_path = edk2_path.WorkspacePath\r
         self._package_config = package_config\r

diff --git a/pip-requirements.txt b/pip-requirements.txt
index aea2e6ece4310a9732fbf465282c07da0a9867f0..f8bcd9ceb5e626f90bef638ec22b3554c5746527 100644 (file)
--- a/pip-requirements.txt
+++ b/pip-requirements.txt
@@ -12,7 +12,7 @@
 # https://www.python.org/dev/peps/pep-0440/#version-specifiers\r
 ##\r
 \r
-edk2-pytool-library==0.10.*\r
-edk2-pytool-extensions~=0.13.3\r
-edk2-basetools==0.1.2\r
+edk2-pytool-library==0.11.2\r
+edk2-pytool-extensions~=0.16.0\r
+edk2-basetools==0.1.13\r
 antlr4-python3-runtime==4.7.1\r