This patch is going to:
1. Add a recovery mode for UPT failure 2. Add UNI file support 3. Add binary file header support 4. Add support for PCD error message 5. Add support for replace 6. Format generated INF/DEC files 7. Update dependency check 8. Other minor fixes Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen <hesheng.chen@intel.com> Reviewed-by: Gao, Liming <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15896 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Hess Chen
hchen30
@ -2,7 +2,7 @@
|
||||
#
|
||||
# This file contained the miscellaneous routines for GenMetaFile usage.
|
||||
#
|
||||
# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
|
||||
# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||
#
|
||||
# This program and the accompanying materials are licensed and made available
|
||||
# under the terms and conditions of the BSD License which accompanies this
|
||||
@ -28,10 +28,11 @@ from Parser.DecParser import Dec
|
||||
# @param ExternList: string of source file FeatureFlag field
|
||||
#
|
||||
def AddExternToDefineSec(SectionDict, Arch, ExternList):
|
||||
LeftOffset = 31
|
||||
for ArchList, EntryPoint, UnloadImage, Constructor, Destructor, FFE, HelpStringList in ExternList:
|
||||
if Arch or ArchList:
|
||||
if EntryPoint:
|
||||
Statement = '%s = %s' % (DT.TAB_INF_DEFINES_ENTRY_POINT, EntryPoint)
|
||||
Statement = (u'%s ' % DT.TAB_INF_DEFINES_ENTRY_POINT).ljust(LeftOffset) + u'= %s' % EntryPoint
|
||||
if FFE:
|
||||
Statement += ' | %s' % FFE
|
||||
if len(HelpStringList) > 0:
|
||||
@ -39,37 +40,40 @@ def AddExternToDefineSec(SectionDict, Arch, ExternList):
|
||||
if len(HelpStringList) > 1:
|
||||
Statement = Statement + HelpStringList[1].GetString()
|
||||
SectionDict[Arch] = SectionDict[Arch] + [Statement]
|
||||
|
||||
if UnloadImage:
|
||||
Statement = '%s = %s' % (DT.TAB_INF_DEFINES_UNLOAD_IMAGE, UnloadImage)
|
||||
Statement = (u'%s ' % DT.TAB_INF_DEFINES_UNLOAD_IMAGE).ljust(LeftOffset) + u'= %s' % UnloadImage
|
||||
if FFE:
|
||||
Statement += ' | %s' % FFE
|
||||
|
||||
|
||||
if len(HelpStringList) > 0:
|
||||
Statement = HelpStringList[0].GetString() + '\n' + Statement
|
||||
if len(HelpStringList) > 1:
|
||||
Statement = Statement + HelpStringList[1].GetString()
|
||||
SectionDict[Arch] = SectionDict[Arch] + [Statement]
|
||||
|
||||
if Constructor:
|
||||
Statement = '%s = %s' % (DT.TAB_INF_DEFINES_CONSTRUCTOR, Constructor)
|
||||
Statement = (u'%s ' % DT.TAB_INF_DEFINES_CONSTRUCTOR).ljust(LeftOffset) + u'= %s' % Constructor
|
||||
if FFE:
|
||||
Statement += ' | %s' % FFE
|
||||
|
||||
if len(HelpStringList) > 0:
|
||||
Statement = HelpStringList[0].GetString() + '\n' + Statement
|
||||
if len(HelpStringList) > 1:
|
||||
Statement = Statement + HelpStringList[1].GetString()
|
||||
SectionDict[Arch] = SectionDict[Arch] + [Statement]
|
||||
if Destructor:
|
||||
Statement = '%s = %s' % (DT.TAB_INF_DEFINES_DESTRUCTOR, Destructor)
|
||||
if FFE:
|
||||
Statement += ' | %s' % FFE
|
||||
|
||||
|
||||
if len(HelpStringList) > 0:
|
||||
Statement = HelpStringList[0].GetString() + '\n' + Statement
|
||||
if len(HelpStringList) > 1:
|
||||
Statement = Statement + HelpStringList[1].GetString()
|
||||
SectionDict[Arch] = SectionDict[Arch] + [Statement]
|
||||
|
||||
|
||||
if Destructor:
|
||||
Statement = (u'%s ' % DT.TAB_INF_DEFINES_DESTRUCTOR).ljust(LeftOffset) + u'= %s' % Destructor
|
||||
if FFE:
|
||||
Statement += ' | %s' % FFE
|
||||
|
||||
if len(HelpStringList) > 0:
|
||||
Statement = HelpStringList[0].GetString() + '\n' + Statement
|
||||
if len(HelpStringList) > 1:
|
||||
Statement = Statement + HelpStringList[1].GetString()
|
||||
SectionDict[Arch] = SectionDict[Arch] + [Statement]
|
||||
|
||||
## ObtainPcdName
|
||||
#
|
||||
# Using TokenSpaceGuidValue and Token to obtain PcdName from DEC file
|
||||
@ -81,7 +85,7 @@ def ObtainPcdName(Packages, TokenSpaceGuidValue, Token):
|
||||
#
|
||||
Guid = PackageDependency.GetGuid()
|
||||
Version = PackageDependency.GetVersion()
|
||||
|
||||
|
||||
#
|
||||
# find package path/name
|
||||
#
|
||||
@ -90,16 +94,22 @@ def ObtainPcdName(Packages, TokenSpaceGuidValue, Token):
|
||||
if (not Version) or (Version == PkgInfo[2]):
|
||||
Path = PkgInfo[3]
|
||||
break
|
||||
|
||||
DecFile = Dec(Path)
|
||||
|
||||
DecFile = None
|
||||
if Path not in GlobalData.gPackageDict:
|
||||
DecFile = Dec(Path)
|
||||
GlobalData.gPackageDict[Path] = DecFile
|
||||
else:
|
||||
DecFile = GlobalData.gPackageDict[Path]
|
||||
|
||||
DecGuidsDict = DecFile.GetGuidSectionObject().ValueDict
|
||||
DecPcdsDict = DecFile.GetPcdSectionObject().ValueDict
|
||||
|
||||
|
||||
TokenSpaceGuidName = ''
|
||||
PcdCName = ''
|
||||
TokenSpaceGuidNameFound = False
|
||||
PcdCNameFound = False
|
||||
|
||||
|
||||
#
|
||||
# Get TokenSpaceGuidCName from Guids section
|
||||
#
|
||||
@ -108,24 +118,24 @@ def ObtainPcdName(Packages, TokenSpaceGuidValue, Token):
|
||||
if TokenSpaceGuidNameFound:
|
||||
break
|
||||
for GuidItem in GuidList:
|
||||
if TokenSpaceGuidValue == GuidItem.GuidString:
|
||||
if TokenSpaceGuidValue.upper() == GuidItem.GuidString.upper():
|
||||
TokenSpaceGuidName = GuidItem.GuidCName
|
||||
TokenSpaceGuidNameFound = True
|
||||
break
|
||||
|
||||
|
||||
#
|
||||
# Retrieve PcdCName from Pcds Section
|
||||
#
|
||||
for PcdKey in DecPcdsDict:
|
||||
PcdList = DecPcdsDict[PcdKey]
|
||||
if PcdCNameFound:
|
||||
break
|
||||
return TokenSpaceGuidName, PcdCName
|
||||
for PcdItem in PcdList:
|
||||
if TokenSpaceGuidName == PcdItem.TokenSpaceGuidCName and Token == PcdItem.TokenValue:
|
||||
PcdCName = PcdItem.TokenCName
|
||||
PcdCNameFound = True
|
||||
break
|
||||
|
||||
break
|
||||
|
||||
return TokenSpaceGuidName, PcdCName
|
||||
|
||||
## _TransferDict
|
||||
@ -133,23 +143,35 @@ def ObtainPcdName(Packages, TokenSpaceGuidValue, Token):
|
||||
# (GenericComment, UsageComment) as value into a dict that using SortedArch as
|
||||
# key and NewStatement as value
|
||||
#
|
||||
def TransferDict(OrigDict):
|
||||
def TransferDict(OrigDict, Type=None):
|
||||
NewDict = {}
|
||||
|
||||
LeftOffset = 0
|
||||
if Type in ['INF_GUID', 'INF_PPI_PROTOCOL']:
|
||||
LeftOffset = 45
|
||||
if Type in ['INF_PCD']:
|
||||
LeftOffset = 75
|
||||
if LeftOffset > 0:
|
||||
for Statement, SortedArch in OrigDict:
|
||||
if len(Statement) > LeftOffset:
|
||||
LeftOffset = len(Statement)
|
||||
|
||||
for Statement, SortedArch in OrigDict:
|
||||
Comment = OrigDict[Statement, SortedArch]
|
||||
#
|
||||
# apply the NComment/1Comment rule
|
||||
#
|
||||
if Comment.find('\n') != len(Comment) - 1:
|
||||
if Comment.find('\n') != len(Comment) - 1:
|
||||
NewStateMent = Comment + Statement
|
||||
else:
|
||||
NewStateMent = Statement + ' ' + Comment.rstrip('\n')
|
||||
if LeftOffset:
|
||||
NewStateMent = Statement.ljust(LeftOffset) + ' ' + Comment.rstrip('\n')
|
||||
else:
|
||||
NewStateMent = Statement + ' ' + Comment.rstrip('\n')
|
||||
|
||||
if SortedArch in NewDict:
|
||||
NewDict[SortedArch] = NewDict[SortedArch] + [NewStateMent]
|
||||
else:
|
||||
NewDict[SortedArch] = [NewStateMent]
|
||||
|
||||
return NewDict
|
||||
|
||||
return NewDict
|
||||
|
||||
|
||||
Reference in New Issue
Block a user