SF.net SVN: edk2-buildtools:[1859] trunk/BaseTools/Source/Python/build/ BuildReport.py

[<qh...@us...>]

Revision: 1859
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=1859&view=rev
Author:   qhuang8
Date:     2010-02-09 15:11:09 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Update PCD report for the correct override relationship

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/build/BuildReport.py

Modified: trunk/BaseTools/Source/Python/build/BuildReport.py
===================================================================
--- trunk/BaseTools/Source/Python/build/BuildReport.py	2010-02-09 13:08:13 UTC (rev 1858)
+++ trunk/BaseTools/Source/Python/build/BuildReport.py	2010-02-09 15:11:09 UTC (rev 1859)
@@ -525,7 +525,6 @@
         else:
             self.FdfPcdSet = {}
 
-        self.DecPcdDefault = {}
         self.ModulePcdOverride = {}
         for Pa in Wa.AutoGenObjectList:
             #
@@ -539,16 +538,8 @@
                 if len(Pcd.TokenCName) > self.MaxLen:
                     self.MaxLen = len(Pcd.TokenCName)
 
-            for ModuleKey in Pa.Platform.Modules:
+            for Module in Pa.Platform.Modules.values():
                 #
-                # Collect PCD DEC default value.
-                #
-                Module = Pa.Platform.Modules[ModuleKey]
-                for Package in Module.M.Module.Packages:
-                    for (TokenCName, TokenSpaceGuidCName, DecType) in Package.Pcds:
-                        DecDefaultValue = Package.Pcds[TokenCName, TokenSpaceGuidCName, DecType].DefaultValue
-                        self.DecPcdDefault.setdefault((TokenCName, TokenSpaceGuidCName, DecType), DecDefaultValue)
-                #
                 # Collect module override PCDs
                 #
                 for ModulePcd in Module.M.ModulePcdList + Module.M.LibraryPcdList:
@@ -558,7 +549,16 @@
                     ModulePath = os.path.basename(Module.M.MetaFile.File)
                     self.ModulePcdOverride.setdefault((TokenCName, TokenSpaceGuid), {})[ModulePath] = ModuleDefault
 
+
         #
+        # Collect PCD DEC default value.
+        #
+        self.DecPcdDefault = {}
+        for Package in Wa.BuildDatabase.WorkspaceDb.PackageList:
+            for (TokenCName, TokenSpaceGuidCName, DecType) in Package.Pcds:
+                DecDefaultValue = Package.Pcds[TokenCName, TokenSpaceGuidCName, DecType].DefaultValue
+                self.DecPcdDefault.setdefault((TokenCName, TokenSpaceGuidCName, DecType), DecDefaultValue)
+        #
         # Collect PCDs defined in DSC common section
         #
         self.DscPcdDefault = {}
@@ -614,9 +614,10 @@
                     #
                     DecDefaultValue = self.DecPcdDefault.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName, DecType))
                     DscDefaultValue = self.DscPcdDefault.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName))
+                    DscDefaultValue = self.FdfPcdSet.get((Pcd.TokenCName, Key), DscDefaultValue)
                     InfDefaultValue = None
+                    
                     PcdValue = DecDefaultValue
-                    
                     if DscDefaultValue:
                         PcdValue = DscDefaultValue
                     if ModulePcdSet != None:
@@ -671,15 +672,15 @@
                     # Report PCD item according to their override relationship
                     #
                     if DecMatch and InfMatch:
-                        FileWrite(File, '    %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', Pcd.DefaultValue))
+                        FileWrite(File, '    %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue))
                     else:
                         if DscMatch:
                             if (Pcd.TokenCName, Key) in self.FdfPcdSet:
-                                FileWrite(File, ' *F %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', Pcd.DefaultValue))
+                                FileWrite(File, ' *F %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue))
                             else:
-                                FileWrite(File, ' *P %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', Pcd.DefaultValue))
+                                FileWrite(File, ' *P %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue))
                         else:
-                            FileWrite(File, ' *M %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', Pcd.DefaultValue))
+                            FileWrite(File, ' *M %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue))
                     
                     if TypeName in ('DYNHII', 'DEXHII', 'DYNVPD', 'DEXVPD'):
                         for SkuInfo in Pcd.SkuInfoList.values():


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.