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

BaseTools: Use gGuidPattern for Guid regular expression 

Use GlobalData.py gGuidPattern for Guid regular expression

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Yunhua Feng 2018-08-06 09:02:25 +08:00 committed by Yonghong Zhu
parent 5ac4548cdf
commit cefc8d8821
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BaseTools/Source/Python/GenFds/GenFds.py
View File

@ -44,6 +44,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as mws
from . import FfsFileStatement from . import FfsFileStatement
import glob import glob
from struct import unpack from struct import unpack
from Common.GlobalData import gGuidPattern
## Version and Copyright ## Version and Copyright
versionNumber = "1.0" + ' ' + gBUILD_VERSION versionNumber = "1.0" + ' ' + gBUILD_VERSION
@ -605,11 +606,7 @@ class GenFds :
GuidDict = {} GuidDict = {}
ModuleList = [] ModuleList = []
FileGuidList = [] FileGuidList = []
GuidPattern = re.compile("\s*([0-9a-fA-F]){8}-" GuidPattern = gGuidPattern
"([0-9a-fA-F]){4}-"
"([0-9a-fA-F]){4}-"
"([0-9a-fA-F]){4}-"
"([0-9a-fA-F]){12}\s*")
for Arch in ArchList: for Arch in ArchList:
PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag] PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]
for ModuleFile in PlatformDataBase.Modules: for ModuleFile in PlatformDataBase.Modules: