#\r
self.PackageSurfaceArea = Sdict() \r
#\r
- # {(Guid, Version, Path) : ModuleObj}\r
+ # {(Guid, Version, Name, Path) : ModuleObj}\r
#\r
self.ModuleSurfaceArea = Sdict() \r
self.Tools = MiscFileObject()\r
ModuleDict = PackageObj.GetModuleDict()\r
ModuleDict[(ModuleObj.GetGuid(), \\r
ModuleObj.GetVersion(), \\r
+ ModuleObj.GetName(), \\r
ModuleObj.GetCombinePath())] = ModuleObj\r
PackageObj.SetModuleDict(ModuleDict)\r
except FatalError, ErrCode:\r
try:\r
ModuleObj = InfPomAlignment(ModuleFileFullPath, \r
WorkspaceDir)\r
- self.ModuleSurfaceArea[(ModuleObj.GetGuid(), \\r
- ModuleObj.GetVersion(), \\r
- ModuleObj.GetCombinePath())] = \\r
- ModuleObj\r
+ ModuleKey = (ModuleObj.GetGuid(), \r
+ ModuleObj.GetVersion(), \r
+ ModuleObj.GetName(), \r
+ ModuleObj.GetCombinePath())\r
+ self.ModuleSurfaceArea[ModuleKey] = ModuleObj\r
except FatalError, ErrCode:\r
if ErrCode.message == EDK1_INF_ERROR:\r
Logger.Error("UPT",\r
\r
Module = None\r
ModuleDict = Package.GetModuleDict()\r
- for Guid, Version, Path in ModuleDict:\r
- Module = ModuleDict[Guid, Version, Path]\r
+ for Guid, Version, Name, Path in ModuleDict:\r
+ Module = ModuleDict[Guid, Version, Name, Path]\r
ModulePath = Module.GetModulePath()\r
FullPath = Module.GetFullPath()\r
PkgRelPath = os.path.normpath(os.path.join(PackagePath, ModulePath))\r
MetaDataFileList.append(Path)\r
self.FileList += GetNonMetaDataFiles(os.path.dirname(FullPath), ['CVS', '.svn'], False, PkgRelPath)\r
\r
- for Guid, Version, Path in self.ModuleSurfaceArea:\r
- Module = self.ModuleSurfaceArea[Guid, Version, Path]\r
+ for Guid, Version, Name, Path in self.ModuleSurfaceArea:\r
+ Module = self.ModuleSurfaceArea[Guid, Version, Name, Path]\r
ModulePath = Module.GetModulePath()\r
FullPath = Module.GetFullPath()\r
MetaDataFileList.append(Path)\r