sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools:Enhance the way to handling included dsc file

Browse Source 
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2400

In Dsc Parser, included dsc file is parsed always no matter
if its condition is False

  gUefiOvmfPkgTokenSpaceGuid.test1|FALSE
!if gUefiOvmfPkgTokenSpaceGuid.test1 == FALSE
  !include OvmfPkg/test1.dsc
!else
  !include OvmfPkg/test2.dsc
!endif

The patch avoids processing redundant dsc files and improves
the way Tool handles them.

In the above case, since the conditional result is FALSE,
"test2.dsc" is not parsed.

Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Fan, ZhijuX
2019-12-03 17:04:25 +08:00
committed by mergify[bot]
parent 9c33f16f8c
commit c8ff8e05af
1 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -1612,46 +1612,47 @@ class DscParser(MetaFileParser):
# First search the include file under the same directory as DSC file # First search the include file under the same directory as DSC file
# #
IncludedFile1 = PathClass(IncludedFile, self.MetaFile.Dir) IncludedFile1 = PathClass(IncludedFile, self.MetaFile.Dir)
ErrorCode, ErrorInfo1 = IncludedFile1.Validate() if self._Enabled:
if ErrorCode != 0: ErrorCode, ErrorInfo1 = IncludedFile1.Validate()
#
# Also search file under the WORKSPACE directory
#
IncludedFile1 = PathClass(IncludedFile, GlobalData.gWorkspace)
ErrorCode, ErrorInfo2 = IncludedFile1.Validate()
if ErrorCode != 0: if ErrorCode != 0:
EdkLogger.error('parser', ErrorCode, File=self._FileWithError, #
Line=self._LineIndex + 1, ExtraData=ErrorInfo1 + "\n" + ErrorInfo2) # Also search file under the WORKSPACE directory
#
IncludedFile1 = PathClass(IncludedFile, GlobalData.gWorkspace)
ErrorCode, ErrorInfo2 = IncludedFile1.Validate()
if ErrorCode != 0:
EdkLogger.error('parser', ErrorCode, File=self._FileWithError,
Line=self._LineIndex + 1, ExtraData=ErrorInfo1 + "\n" + ErrorInfo2)
self._FileWithError = IncludedFile1 self._FileWithError = IncludedFile1
FromItem = self._Content[self._ContentIndex - 1][0] FromItem = self._Content[self._ContentIndex - 1][0]
if self._InSubsection: if self._InSubsection:
Owner = self._Content[self._ContentIndex - 1][8] Owner = self._Content[self._ContentIndex - 1][8]
else: else:
Owner = self._Content[self._ContentIndex - 1][0] Owner = self._Content[self._ContentIndex - 1][0]
IncludedFileTable = MetaFileStorage(self._RawTable.DB, IncludedFile1, MODEL_FILE_DSC, False, FromItem=FromItem) IncludedFileTable = MetaFileStorage(self._RawTable.DB, IncludedFile1, MODEL_FILE_DSC, False, FromItem=FromItem)
Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable, Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable,
Owner=Owner, From=FromItem) Owner=Owner, From=FromItem)
self.IncludedFiles.add (IncludedFile1) self.IncludedFiles.add (IncludedFile1)
# set the parser status with current status # set the parser status with current status
Parser._SectionName = self._SectionName Parser._SectionName = self._SectionName
Parser._SubsectionType = self._SubsectionType Parser._SubsectionType = self._SubsectionType
Parser._InSubsection = self._InSubsection Parser._InSubsection = self._InSubsection
Parser._SectionType = self._SectionType Parser._SectionType = self._SectionType
Parser._Scope = self._Scope Parser._Scope = self._Scope
Parser._Enabled = self._Enabled Parser._Enabled = self._Enabled
# Parse the included file # Parse the included file
Parser.StartParse() Parser.StartParse()
# Insert all records in the table for the included file into dsc file table # Insert all records in the table for the included file into dsc file table
Records = IncludedFileTable.GetAll() Records = IncludedFileTable.GetAll()
if Records: if Records:
self._Content[self._ContentIndex:self._ContentIndex] = Records self._Content[self._ContentIndex:self._ContentIndex] = Records
self._Content.pop(self._ContentIndex - 1) self._Content.pop(self._ContentIndex - 1)
self._ValueList = None self._ValueList = None
self._ContentIndex -= 1 self._ContentIndex -= 1
def __ProcessPackages(self): def __ProcessPackages(self):
self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros) self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)