ERR_DECPARSE_DEFINE_UNKNOWKEY = \\r
_("Unknown key [%s] in define section.")\r
ERR_DECPARSE_DEFINE_SPEC = \\r
-_("Specification value must be HEX numbers.")\r
+_("Specification value must be HEX numbers or decimal numbers.")\r
ERR_DECPARSE_DEFINE_PKGNAME = \\r
_("Package name must be AlphaNumeric characters.")\r
ERR_DECPARSE_DEFINE_PKGGUID = \\r
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
\r
def GetDefines(self):\r
return self.Defines \r
-
\ No newline at end of file
+ \r
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
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