Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Core / DistributionPackageClass.py

diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
index 03872379518eb26c5b38ad7e9e8259a3703c84f8..8ac8d4ed5255253ef9415f0a6cc99ba74646bb9a 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -95,7 +95,7 @@ class DistributionPackageClass(object):
         #\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
@@ -149,6 +149,7 @@ class DistributionPackageClass(object):
                         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
@@ -172,10 +173,11 @@ class DistributionPackageClass(object):
                 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
@@ -207,16 +209,16 @@ class DistributionPackageClass(object):
         \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