public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch] BaseTools: Add back the cc71d8 version's fix
@ 2018-01-04  9:24 Yonghong Zhu
  2018-01-08  6:11 ` Gao, Liming
  0 siblings, 1 reply; 2+ messages in thread
From: Yonghong Zhu @ 2018-01-04  9:24 UTC (permalink / raw)
  To: edk2-devel

The version cc71d8's fix was washed out by structure pcd report patch.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/build/BuildReport.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index d2ac044..d6e943d 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -869,11 +869,11 @@ class PcdReport(object):
         # Collect PCDs defined in DSC common section
         #
         self.DscPcdDefault = {}
         for Pa in Wa.AutoGenObjectList:
             for (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds:
-                DscDefaultValue = Pa.Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DefaultValue
+                DscDefaultValue = Pa.Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DscDefaultValue
                 if DscDefaultValue:
                     self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] = DscDefaultValue
 
     def GenerateReport(self, File, ModulePcdSet):
         if self.ConditionalPcds:
@@ -1032,21 +1032,21 @@ class PcdReport(object):
                             DecMatch = False
                     #
                     # Report PCD item according to their override relationship
                     #
                     if DecMatch and InfMatch:
-                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '  ')
+                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '  ')
                     elif BuildOptionMatch:
-                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*B')
+                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*B')
                     else:
                         if DscMatch:
                             if (Pcd.TokenCName, Key) in self.FdfPcdSet:
-                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*F')
+                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*F')
                             else:
-                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*P')
+                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*P')
                         else:
-                            self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*M')
+                            self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*M')
 
                     if ModulePcdSet == None:
                         if IsStructure:
                             continue
                         if not TypeName in ('PATCH', 'FLAG', 'FIXED'):
-- 
2.6.1.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: Add back the cc71d8 version's fix
  2018-01-04  9:24 [Patch] BaseTools: Add back the cc71d8 version's fix Yonghong Zhu
@ 2018-01-08  6:11 ` Gao, Liming
  0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2018-01-08  6:11 UTC (permalink / raw)
  To: Zhu, Yonghong, edk2-devel@lists.01.org

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Thursday, January 04, 2018 5:25 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Add back the cc71d8 version's fix
>
>The version cc71d8's fix was washed out by structure pcd report patch.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/build/BuildReport.py | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/BaseTools/Source/Python/build/BuildReport.py
>b/BaseTools/Source/Python/build/BuildReport.py
>index d2ac044..d6e943d 100644
>--- a/BaseTools/Source/Python/build/BuildReport.py
>+++ b/BaseTools/Source/Python/build/BuildReport.py
>@@ -869,11 +869,11 @@ class PcdReport(object):
>         # Collect PCDs defined in DSC common section
>         #
>         self.DscPcdDefault = {}
>         for Pa in Wa.AutoGenObjectList:
>             for (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds:
>-                DscDefaultValue = Pa.Platform.Pcds[(TokenCName,
>TokenSpaceGuidCName)].DefaultValue
>+                DscDefaultValue = Pa.Platform.Pcds[(TokenCName,
>TokenSpaceGuidCName)].DscDefaultValue
>                 if DscDefaultValue:
>                     self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] =
>DscDefaultValue
>
>     def GenerateReport(self, File, ModulePcdSet):
>         if self.ConditionalPcds:
>@@ -1032,21 +1032,21 @@ class PcdReport(object):
>                             DecMatch = False
>                     #
>                     # Report PCD item according to their override relationship
>                     #
>                     if DecMatch and InfMatch:
>-                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '  ')
>+                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '  ')
>                     elif BuildOptionMatch:
>-                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*B')
>+                        self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*B')
>                     else:
>                         if DscMatch:
>                             if (Pcd.TokenCName, Key) in self.FdfPcdSet:
>-                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*F')
>+                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*F')
>                             else:
>-                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*P')
>+                                self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*P')
>                         else:
>-                            self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*M')
>+                            self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName,
>IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue,
>DecMatch, DecDefaultValue, '*M')
>
>                     if ModulePcdSet == None:
>                         if IsStructure:
>                             continue
>                         if not TypeName in ('PATCH', 'FLAG', 'FIXED'):
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-08  6:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-04  9:24 [Patch] BaseTools: Add back the cc71d8 version's fix Yonghong Zhu
2018-01-08  6:11 ` Gao, Liming

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox