Cc: Liming Gao <[email protected]>
Cc: Yonghong Zhu <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <[email protected]>
---
BaseTools/Source/Python/Workspace/DscBuildData.py | 4 +++-
BaseTools/Source/Python/Workspace/MetaFileParser.py | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
b/BaseTools/Source/Python/Workspace/DscBuildData.py
index d6b8b761d607..be3f7b6881e8 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -41,6 +41,8 @@ from Common.Misc import SaveFileOnChange
from Workspace.BuildClassObject import PlatformBuildClassObject, StructurePcd,
PcdClassObject, ModuleBuildClassObject
from collections import OrderedDict
+variablePattern = re.compile(r'[\t\s]*0[xX][a-fA-F0-9]+$')
+
#
# Treat CHAR16 as a synonym for UINT16. CHAR16 support is required for VFR C
structs
#
@@ -2421,7 +2423,7 @@ class DscBuildData(PlatformBuildClassObject):
if VariableOffset.isdigit():
if int(VariableOffset, 10) > 0xFFFF:
ExceedMax = True
- elif re.match(r'[\t\s]*0[xX][a-fA-F0-9]+$', VariableOffset):
+ elif variablePattern.match(VariableOffset):
if int(VariableOffset, 16) > 0xFFFF:
ExceedMax = True
# For Offset written in "A.B"
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py
b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 322ed3844966..550359f9abb2 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -35,6 +35,10 @@ from Common.LongFilePathSupport import OpenLongFilePath as
open
from MetaFileTable import MetaFileStorage
from MetaFileCommentParser import CheckInfComment
+## RegEx for finding file versions
+hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')
+decVersionPattern = re.compile(r'\d+\.\d+')
+
## A decorator used to parse macro definition
def ParseMacro(Parser):
def MacroParser(self):
@@ -366,9 +370,9 @@ class MetaFileParser(object):
EdkLogger.error("Parser", FORMAT_INVALID, "%s not defined" %
(Macro), ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex
+ 1)
# Sometimes, we need to make differences between EDK and EDK2 modules
if Name == 'INF_VERSION':
- if re.match(r'0[xX][\da-f-A-F]{5,8}', Value):
+ if hexVersionPattern.match(Value):
self._Version = int(Value, 0)
- elif re.match(r'\d+\.\d+', Value):
+ elif decVersionPattern.match(Value):
ValueList = Value.split('.')
Major = '%04o' % int(ValueList[0], 0)
Minor = '%04o' % int(ValueList[1], 0)
--
2.16.2.windows.1
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
