From 48b77f5ea9091d78098ba0d6168d4b638914f280 Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Wed, 18 Nov 2015 05:38:35 +0000 Subject: BaseTool/UPT: Add supporting of decimal numbers for INF_VERSION and DEC_SPECIFICATION Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen Reviewed-by: Yonghong Zhu git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18868 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Source/Python/UPT/Object/Parser/InfDefineObject.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py') diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py index be9a0e196e..1d074ee638 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py @@ -340,16 +340,21 @@ class InfDefSection(InfDefSectionOptionRomInfo): ErrorInInf(ST.ERR_INF_PARSER_NOT_SUPPORT_EDKI_INF, ErrorCode=ToolError.EDK1_INF_ERROR, LineInfo=self.CurrentLine) - - self.InfVersion = InfDefMember() - self.InfVersion.SetValue(InfVersion) - self.InfVersion.Comments = Comments - return True + elif IsValidDecVersionVal(InfVersion): + if (InfVersion < 65541): + ErrorInInf(ST.ERR_INF_PARSER_NOT_SUPPORT_EDKI_INF, + ErrorCode=ToolError.EDK1_INF_ERROR, + LineInfo=self.CurrentLine) else: ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(InfVersion), LineInfo=self.CurrentLine) return False + self.InfVersion = InfDefMember() + self.InfVersion.SetValue(InfVersion) + self.InfVersion.Comments = Comments + return True + ## GetInfVersion # def GetInfVersion(self): @@ -1000,4 +1005,4 @@ class InfDefObject(InfSectionCommonDef): def GetDefines(self): return self.Defines - \ No newline at end of file + -- cgit v1.2.3