diff options
| author | Hess Chen <hesheng.chen@intel.com> | 2015-11-18 05:38:35 +0000 |
|---|---|---|
| committer | hchen30 <hchen30@Edk2> | 2015-11-18 05:38:35 +0000 |
| commit | 48b77f5ea9091d78098ba0d6168d4b638914f280 (patch) | |
| tree | eb1ab9b17fd133288a0fedf058af30ede917bc74 /BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py | |
| parent | b9335cf562f11a096efea6c98d8612f22929eeb9 (diff) | |
| download | edk2-platforms-48b77f5ea9091d78098ba0d6168d4b638914f280.tar.xz | |
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 <hesheng.chen@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18868 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py')
| -rw-r--r-- | BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py | 17 |
1 files changed, 11 insertions, 6 deletions
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 +
|