diff options
| author | Feng, Bob C <bob.c.feng@intel.com> | 2017-12-26 11:33:33 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2017-12-26 11:41:34 +0800 |
| commit | 5644e5cecebeeefea90cfda093df68e0aa6e0361 (patch) | |
| tree | 6102b62632d7a667b93988f88c057ca29e79cd1b /BaseTools | |
| parent | 2ec099da133c0b01092302d86f7881c0ec7e412b (diff) | |
| download | edk2-5644e5cecebeeefea90cfda093df68e0aa6e0361.tar.gz edk2-5644e5cecebeeefea90cfda093df68e0aa6e0361.tar.bz2 edk2-5644e5cecebeeefea90cfda093df68e0aa6e0361.zip | |
BaseTools: Fix building FatPkg failed issue
Using property instead of vairable for DecPcds.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index 135b608ad2..054ad2c254 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1012,7 +1012,7 @@ class DscBuildData(PlatformBuildClassObject): "Pcd (%s.%s) defined in DSC is not declared in DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch),
File=self.MetaFile,Line = StrPcdSet[str_pcd][0][5])
# Add the Structure PCD that only defined in DEC, don't have override in DSC file
- for Pcd in self._DecPcds:
+ for Pcd in self.DecPcds:
if type (self._DecPcds[Pcd]) is StructurePcd:
if Pcd not in S_pcd_set:
str_pcd_obj_str = StructurePcd()
@@ -1977,7 +1977,21 @@ class DscBuildData(PlatformBuildClassObject): if (Name, Guid) not in self.Pcds:
self.Pcds[Name, Guid] = PcdClassObject(Name, Guid, '', '', '', '', '', {}, False, None)
self.Pcds[Name, Guid].DefaultValue = Value
-
+ @property
+ def DecPcds(self):
+ if self._DecPcds == None:
+ FdfInfList = []
+ if GlobalData.gFdfParser:
+ FdfInfList = GlobalData.gFdfParser.Profile.InfList
+ PkgSet = set()
+ for Inf in FdfInfList:
+ ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch=self._Arch)
+ if ModuleFile in self._Modules:
+ continue
+ ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]
+ PkgSet.update(ModuleData.Packages)
+ self._DecPcds = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)
+ return self._DecPcds
_Macros = property(_GetMacros)
Arch = property(_GetArch, _SetArch)
Platform = property(_GetPlatformName)
|