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

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Parser / DecParser.py

diff --git a/BaseTools/Source/Python/UPT/Parser/DecParser.py b/BaseTools/Source/Python/UPT/Parser/DecParser.py
index 25407f9a2d505b975bd8b99e51af92c41b258dd2..23d1ed4dbb23c74b1e46db6ce4e5b89afd27634b 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/DecParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/DecParser.py
@@ -29,6 +29,7 @@ from Library.ParserValidate import IsValidIdString
 from Library.ParserValidate import IsValidUserId\r
 from Library.ParserValidate import IsValidArch\r
 from Library.ParserValidate import IsValidWord\r
+from Library.ParserValidate import IsValidDecVersionVal\r
 from Parser.DecParserMisc import TOOL_NAME\r
 from Parser.DecParserMisc import CleanString\r
 from Parser.DecParserMisc import IsValidPcdDatum\r
@@ -452,7 +453,8 @@ class _DecDefine(_DecBase):
         if self.ItemObject.GetPackageSpecification():\r
             self._LoggerError(ST.ERR_DECPARSE_DEFINE_DEFINED % DT.TAB_DEC_DEFINES_DEC_SPECIFICATION)\r
         if not IsValidToken('0[xX][0-9a-fA-F]{8}', Token):\r
-            self._LoggerError(ST.ERR_DECPARSE_DEFINE_SPEC)\r
+            if not IsValidDecVersionVal(Token):\r
+                self._LoggerError(ST.ERR_DECPARSE_DEFINE_SPEC)\r
         self.ItemObject.SetPackageSpecification(Token)\r
     \r
     def _SetPackageName(self, Token):\r