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>

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 156aae1d0e3756b58e108386c00da3052b9e42a7..2307a19cbeec7ae9013aaa0033418eead42240e4 100644 (file)
--- 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\r
 import glob\r
 from struct import unpack\r
+from Common.GlobalData import gGuidPattern\r
 \r
 ## Version and Copyright\r
 versionNumber = "1.0" + ' ' + gBUILD_VERSION\r
@@ -605,11 +606,7 @@ class GenFds :
         GuidDict = {}\r
         ModuleList = []\r
         FileGuidList = []\r
-        GuidPattern = re.compile("\s*([0-9a-fA-F]){8}-"\r
-                                       "([0-9a-fA-F]){4}-"\r
-                                       "([0-9a-fA-F]){4}-"\r
-                                       "([0-9a-fA-F]){4}-"\r
-                                       "([0-9a-fA-F]){12}\s*")\r
+        GuidPattern = gGuidPattern\r
         for Arch in ArchList:\r
             PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
             for ModuleFile in PlatformDataBase.Modules:\r