BaseTool/UPT: Add supporting of decimal numbers for INF_VERSION and DEC_SPECIFICATION

[mirror_edk2.git] / 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 be9a0e196e39e7f861eb46e15c204c5577399800..1d074ee638fdfb8da5928c08db65c7959715bf95 100644 (file)
--- 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,\r
                            ErrorCode=ToolError.EDK1_INF_ERROR,\r
                            LineInfo=self.CurrentLine)\r
-                \r
-            self.InfVersion = InfDefMember()\r
-            self.InfVersion.SetValue(InfVersion)\r
-            self.InfVersion.Comments = Comments          \r
-            return True\r
+        elif IsValidDecVersionVal(InfVersion):\r
+            if (InfVersion < 65541):\r
+                ErrorInInf(ST.ERR_INF_PARSER_NOT_SUPPORT_EDKI_INF,\r
+                           ErrorCode=ToolError.EDK1_INF_ERROR,\r
+                           LineInfo=self.CurrentLine)\r
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(InfVersion),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
 \r
+        self.InfVersion = InfDefMember()\r
+        self.InfVersion.SetValue(InfVersion)\r
+        self.InfVersion.Comments = Comments\r
+        return True\r
+\r
     ## GetInfVersion\r
     #                     \r
     def GetInfVersion(self):\r
@@ -1000,4 +1005,4 @@ class InfDefObject(InfSectionCommonDef):
     \r
     def GetDefines(self):\r
         return self.Defines                      \r
-        
\ No newline at end of file
+        \r