mirror of https://github.com/acidanthera/audk.git
BaseTools: Support DSC component !include PCD items
DSC format: [Components] TestPkg/TestDriver.inf { <PcdsFixedAtBuild> !include TestPkg/Test.txt } Test.txt content: PcdToken.PcdCName | 0x123 Per spec we should support this usage. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
parent
25598f8bdb
commit
3378782691
|
@ -1538,9 +1538,13 @@ class DscParser(MetaFileParser):
|
||||||
self._FileWithError = IncludedFile1
|
self._FileWithError = IncludedFile1
|
||||||
|
|
||||||
IncludedFileTable = MetaFileStorage(self._Table.Cur, IncludedFile1, MODEL_FILE_DSC, False)
|
IncludedFileTable = MetaFileStorage(self._Table.Cur, IncludedFile1, MODEL_FILE_DSC, False)
|
||||||
Owner = self._Content[self._ContentIndex - 1][0]
|
FromItem = self._Content[self._ContentIndex - 1][0]
|
||||||
|
if self._Content[self._ContentIndex - 1][8] != -1.0:
|
||||||
|
Owner = self._Content[self._ContentIndex - 1][8]
|
||||||
|
else:
|
||||||
|
Owner = self._Content[self._ContentIndex - 1][0]
|
||||||
Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable,
|
Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable,
|
||||||
Owner=Owner, From=Owner)
|
Owner=Owner, From=FromItem)
|
||||||
|
|
||||||
self.IncludedFiles.add (IncludedFile1)
|
self.IncludedFiles.add (IncludedFile1)
|
||||||
|
|
||||||
|
@ -1552,7 +1556,10 @@ class DscParser(MetaFileParser):
|
||||||
|
|
||||||
# set the parser status with current status
|
# set the parser status with current status
|
||||||
Parser._SectionName = self._SectionName
|
Parser._SectionName = self._SectionName
|
||||||
Parser._SectionType = self._SectionType
|
if self._InSubsection:
|
||||||
|
Parser._SectionType = self._SubsectionType
|
||||||
|
else:
|
||||||
|
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
|
||||||
|
|
Loading…
Reference in New Issue