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

.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>
This commit is contained in:
Ken Lautner 2022-03-08 14:42:08 -08:00 committed by mergify[bot]
parent 56530dec11
commit 2aac8bb7ef
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.pytool/Plugin/CharEncodingCheck/CharEncodingCheck.py
View File

@ -69,7 +69,7 @@ class CharEncodingCheck(ICiBuildPlugin):
overall_status = 0 overall_status = 0
files_tested = 0 files_tested = 0
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)
if abs_pkg_path is None: if abs_pkg_path is None:
tc.SetSkipped() tc.SetSkipped()
@ -90,7 +90,7 @@ class CharEncodingCheck(ICiBuildPlugin):
tc.LogStdError("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem. Invalid ignore file".format(a)) tc.LogStdError("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem. Invalid ignore file".format(a))
logging.info("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem. Invalid ignore file".format(a)) logging.info("CharEncodingCheck.IgnoreInf -> {0} not found in filesystem. Invalid ignore file".format(a))
files = [Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(x) for x in files] files = [Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(x) for x in files]
for a in files: for a in files:
files_tested += 1 files_tested += 1
if(self.TestEncodingOk(a, enc)): if(self.TestEncodingOk(a, enc)):

2
.pytool/Plugin/CompilerPlugin/CompilerPlugin.py
View File

@ -61,7 +61,7 @@ class CompilerPlugin(ICiBuildPlugin):
tc.LogStdError("DscPath not found in config file. Nothing to compile.") tc.LogStdError("DscPath not found in config file. Nothing to compile.")
return -1 return -1
AP = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) AP = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)
APDSC = os.path.join(AP, pkgconfig["DscPath"].strip()) APDSC = os.path.join(AP, pkgconfig["DscPath"].strip())
AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC) AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC)

2
.pytool/Plugin/DependencyCheck/DependencyCheck.py
View File

@ -55,7 +55,7 @@ class DependencyCheck(ICiBuildPlugin):
overall_status = 0 overall_status = 0
# Get current platform # Get current platform
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)
# Get INF Files # Get INF Files
INFFiles = self.WalkDirectoryForExtension([".inf"], abs_pkg_path) INFFiles = self.WalkDirectoryForExtension([".inf"], abs_pkg_path)

2
.pytool/Plugin/DscCompleteCheck/DscCompleteCheck.py
View File

@ -58,7 +58,7 @@ class DscCompleteCheck(ICiBuildPlugin):
"DscPath not found in config file. Nothing to check.") "DscPath not found in config file. Nothing to check.")
return -1 return -1
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
packagename) packagename)
abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip()) abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip())
wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath( wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(

2
.pytool/Plugin/GuidCheck/GuidCheck.py
View File

@ -116,7 +116,7 @@ class GuidCheck(ICiBuildPlugin):
def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None): def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None):
Errors = [] Errors = []
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
packagename) packagename)
if abs_pkg_path is None: if abs_pkg_path is None:

2
.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py
View File

@ -93,7 +93,7 @@ class HostUnitTestCompilerPlugin(ICiBuildPlugin):
tc.LogStdError("DscPath not found in config file. Nothing to compile for HostBasedUnitTests.") tc.LogStdError("DscPath not found in config file. Nothing to compile for HostBasedUnitTests.")
return -1 return -1
AP = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) AP = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)
APDSC = os.path.join(AP, pkgconfig["DscPath"].strip()) APDSC = os.path.join(AP, pkgconfig["DscPath"].strip())
AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC) AP_Path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(APDSC)

2
.pytool/Plugin/HostUnitTestDscCompleteCheck/HostUnitTestDscCompleteCheck.py
View File

@ -61,7 +61,7 @@ class HostUnitTestDscCompleteCheck(ICiBuildPlugin):
"DscPath not found in config file. Nothing to check.") "DscPath not found in config file. Nothing to check.")
return -1 return -1
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
packagename) packagename)
abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip()) abs_dsc_path = os.path.join(abs_pkg_path, pkgconfig["DscPath"].strip())
wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath( wsr_dsc_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(

2
.pytool/Plugin/LibraryClassCheck/LibraryClassCheck.py
View File

@ -63,7 +63,7 @@ class LibraryClassCheck(ICiBuildPlugin):
overall_status = 0 overall_status = 0
LibraryClassIgnore = [] LibraryClassIgnore = []
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath(packagename) abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(packagename)
abs_dec_path = self.__GetPkgDec(abs_pkg_path) abs_dec_path = self.__GetPkgDec(abs_pkg_path)
wsr_dec_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(abs_dec_path) wsr_dec_path = Edk2pathObj.GetEdk2RelativePathFromAbsolutePath(abs_dec_path)

2
.pytool/Plugin/SpellCheck/SpellCheck.py
View File

@ -73,7 +73,7 @@ class SpellCheck(ICiBuildPlugin):
def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None): def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environment, PLM, PLMHelper, tc, output_stream=None):
Errors = [] Errors = []
abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSytemFromEdk2RelativePath( abs_pkg_path = Edk2pathObj.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
packagename) packagename)
if abs_pkg_path is None: if abs_pkg_path is None:

2
.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
View File

@ -421,7 +421,7 @@ class UncrustifyCheck(ICiBuildPlugin):
""" """
Initializes plugin environment information. Initializes plugin environment information.
""" """
self._abs_package_path = edk2_path.GetAbsolutePathOnThisSytemFromEdk2RelativePath( self._abs_package_path = edk2_path.GetAbsolutePathOnThisSystemFromEdk2RelativePath(
package_rel_path) package_rel_path)
self._abs_workspace_path = edk2_path.WorkspacePath self._abs_workspace_path = edk2_path.WorkspacePath
self._package_config = package_config self._package_config = package_config

6
pip-requirements.txt
View File

@ -12,7 +12,7 @@
# https://www.python.org/dev/peps/pep-0440/#version-specifiers # https://www.python.org/dev/peps/pep-0440/#version-specifiers
## ##
edk2-pytool-library==0.10.* edk2-pytool-library==0.11.2
edk2-pytool-extensions~=0.13.3 edk2-pytool-extensions~=0.16.0
edk2-basetools==0.1.2 edk2-basetools==0.1.13
antlr4-python3-runtime==4.7.1 antlr4-python3-runtime==4.7.1