diff options
| author | Yunhua Feng <yunhuax.feng@intel.com> | 2018-08-06 09:02:25 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-08-08 11:43:42 +0800 |
| commit | cefc8d8821f0a5ec7995901146dd6b055d7b956a (patch) | |
| tree | 3b8c0c677c263c4f6ad3a0db11b64b3c3c1b7543 | |
| parent | 5ac4548cdf6545b08fb04b83b225262d85cb0033 (diff) | |
| download | edk2-cefc8d8821f0a5ec7995901146dd6b055d7b956a.tar.gz edk2-cefc8d8821f0a5ec7995901146dd6b055d7b956a.tar.bz2 edk2-cefc8d8821f0a5ec7995901146dd6b055d7b956a.zip | |
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>
| -rw-r--r-- | BaseTools/Source/Python/GenFds/GenFds.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index 156aae1d0e..2307a19cbe 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -44,6 +44,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as mws from . import FfsFileStatement
import glob
from struct import unpack
+from Common.GlobalData import gGuidPattern
## Version and Copyright
versionNumber = "1.0" + ' ' + gBUILD_VERSION
@@ -605,11 +606,7 @@ class GenFds : GuidDict = {}
ModuleList = []
FileGuidList = []
- GuidPattern = re.compile("\s*([0-9a-fA-F]){8}-"
- "([0-9a-fA-F]){4}-"
- "([0-9a-fA-F]){4}-"
- "([0-9a-fA-F]){4}-"
- "([0-9a-fA-F]){12}\s*")
+ GuidPattern = gGuidPattern
for Arch in ArchList:
PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]
for ModuleFile in PlatformDataBase.Modules:
|