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

  1. Support use expression as DSC file PCD value.
  2. Update FDF parser to fix bug to get complete macro value.
  3. Fix bug to replace SET statement macro and evaluate SET statement PCD value in FDF file.
  4. Fix a bug for MACRO defined in conditional block cannot be processed correctly

Signed-off-by: lgao4
Reviewed-by: gikidy


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12827 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 11 insertions, 9 deletions

diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
index 0387237951..8ac8d4ed52 100644
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -95,7 +95,7 @@ class DistributionPackageClass(object):
         #

         self.PackageSurfaceArea = Sdict() 

         #

-        # {(Guid, Version, Path) : ModuleObj}

+        # {(Guid, Version, Name, Path) : ModuleObj}

         #

         self.ModuleSurfaceArea = Sdict()  

         self.Tools = MiscFileObject()

@@ -149,6 +149,7 @@ class DistributionPackageClass(object):
                         ModuleDict = PackageObj.GetModuleDict()

                         ModuleDict[(ModuleObj.GetGuid(), \

                                     ModuleObj.GetVersion(), \

+                                    ModuleObj.GetName(), \

                                     ModuleObj.GetCombinePath())] = ModuleObj

                         PackageObj.SetModuleDict(ModuleDict)

                     except FatalError, ErrCode:

@@ -172,10 +173,11 @@ class DistributionPackageClass(object):
                 try:

                     ModuleObj = InfPomAlignment(ModuleFileFullPath, 

                                                 WorkspaceDir)

-                    self.ModuleSurfaceArea[(ModuleObj.GetGuid(), \

-                                            ModuleObj.GetVersion(), \

-                                            ModuleObj.GetCombinePath())] = \

-                                            ModuleObj

+                    ModuleKey = (ModuleObj.GetGuid(), 

+                                 ModuleObj.GetVersion(), 

+                                 ModuleObj.GetName(), 

+                                 ModuleObj.GetCombinePath())

+                    self.ModuleSurfaceArea[ModuleKey] = ModuleObj

                 except FatalError, ErrCode:

                     if ErrCode.message == EDK1_INF_ERROR:

                         Logger.Error("UPT",

@@ -207,16 +209,16 @@ class DistributionPackageClass(object):
         

             Module = None

             ModuleDict = Package.GetModuleDict()

-            for Guid, Version, Path in ModuleDict:

-                Module = ModuleDict[Guid, Version, Path]

+            for Guid, Version, Name, Path in ModuleDict:

+                Module = ModuleDict[Guid, Version, Name, Path]

                 ModulePath = Module.GetModulePath()

                 FullPath = Module.GetFullPath()

                 PkgRelPath = os.path.normpath(os.path.join(PackagePath, ModulePath))

                 MetaDataFileList.append(Path)

                 self.FileList += GetNonMetaDataFiles(os.path.dirname(FullPath), ['CVS', '.svn'], False, PkgRelPath)

      

-        for Guid, Version, Path in self.ModuleSurfaceArea:

-            Module = self.ModuleSurfaceArea[Guid, Version, Path]

+        for Guid, Version, Name, Path in self.ModuleSurfaceArea:

+            Module = self.ModuleSurfaceArea[Guid, Version, Name, Path]

             ModulePath = Module.GetModulePath()

             FullPath = Module.GetFullPath()

             MetaDataFileList.append(Path)