tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Fix the bug when use FILE_GUID override the module in DSC 

In last commit 2502b73, it doesn't cover the case that in the DSC file
use FILE_GUID to override the module.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu 2016-08-03 17:09:18 +08:00
parent c3915fa586
commit 622b17582e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -330,15 +330,21 @@ class WorkspaceAutoGen(AutoGen):
EdkLogger.error("build", OPTION_VALUE_INVALID, EdkLogger.error("build", OPTION_VALUE_INVALID,
"No such an FV in FDF file: %s" % fvname) "No such an FV in FDF file: %s" % fvname)
# In DSC file may use FILE_GUID to override the module, then in the Platform.Modules use FILE_GUIDmodule.inf as key,
# but the path (self.MetaFile.Path) is the real path
for key in self.FdfProfile.InfDict: for key in self.FdfProfile.InfDict:
if key == 'ArchTBD': if key == 'ArchTBD':
Platform_cache = {} Platform_cache = {}
MetaFile_cache = {}
for Arch in self.ArchList: for Arch in self.ArchList:
Platform_cache[Arch] = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain] Platform_cache[Arch] = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
MetaFile_cache[Arch] = []
for Pkey in Platform_cache[Arch].Modules.keys():
MetaFile_cache[Arch].append(Platform_cache[Arch].Modules[Pkey].MetaFile)
for Inf in self.FdfProfile.InfDict[key]: for Inf in self.FdfProfile.InfDict[key]:
ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch) ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)
for Arch in self.ArchList: for Arch in self.ArchList:
if ModuleFile in Platform_cache[Arch].Modules: if ModuleFile in MetaFile_cache[Arch]:
break break
else: else:
ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain] ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]
@ -349,9 +355,12 @@ class WorkspaceAutoGen(AutoGen):
for Arch in self.ArchList: for Arch in self.ArchList:
if Arch == key: if Arch == key:
Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain] Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
MetaFileList = []
for Pkey in Platform.Modules.keys():
MetaFileList.append(Platform.Modules[Pkey].MetaFile)
for Inf in self.FdfProfile.InfDict[key]: for Inf in self.FdfProfile.InfDict[key]:
ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch) ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch)
if ModuleFile in Platform.Modules: if ModuleFile in MetaFileList:
continue continue
ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain] ModuleData = self.BuildDatabase[ModuleFile, Arch, Target, Toolchain]
if not ModuleData.IsBinaryModule: if not ModuleData.IsBinaryModule: