Pcds in Conditional Directives and Pcds not used are Platform Level
info, it should not display in Module PCD Section.

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

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 966a2aa..6a79e23 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -875,14 +875,15 @@ class PcdReport(object):
                 DscDefaultValue = Pa.Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DscDefaultValue
                 if DscDefaultValue:
                     self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] = DscDefaultValue
 
     def GenerateReport(self, File, ModulePcdSet):
-        if self.ConditionalPcds:
-            self.GenerateReportDetail(File, ModulePcdSet, 1)
-        if self.UnusedPcds:
-            self.GenerateReportDetail(File, ModulePcdSet, 2)
+        if not ModulePcdSet:
+            if self.ConditionalPcds:
+                self.GenerateReportDetail(File, ModulePcdSet, 1)
+            if self.UnusedPcds:
+                self.GenerateReportDetail(File, ModulePcdSet, 2)
         self.GenerateReportDetail(File, ModulePcdSet)
 
     ##
     # Generate report for PCD information
     #
@@ -902,11 +903,11 @@ class PcdReport(object):
         if ReportSubType == 1:
             PcdDict = self.ConditionalPcds
         elif ReportSubType == 2:
             PcdDict = self.UnusedPcds
 
-        if ModulePcdSet is None:
+        if not ModulePcdSet:
             FileWrite(File, gSectionStart)
             if ReportSubType == 1:
                 FileWrite(File, "Conditional Directives used by the build system")
             elif ReportSubType == 2:
                 FileWrite(File, "PCDs not used by modules or in conditional directives")
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

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: Monday, April 02, 2018 11:20 AM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Pcd not used info should not in Module
>PCD section
>
>Pcds in Conditional Directives and Pcds not used are Platform Level
>info, it should not display in Module PCD Section.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/build/BuildReport.py | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/BaseTools/Source/Python/build/BuildReport.py
>b/BaseTools/Source/Python/build/BuildReport.py
>index 966a2aa..6a79e23 100644
>--- a/BaseTools/Source/Python/build/BuildReport.py
>+++ b/BaseTools/Source/Python/build/BuildReport.py
>@@ -875,14 +875,15 @@ class PcdReport(object):
>                 DscDefaultValue = Pa.Platform.Pcds[(TokenCName,
>TokenSpaceGuidCName)].DscDefaultValue
>                 if DscDefaultValue:
>                     self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] =
>DscDefaultValue
>
>     def GenerateReport(self, File, ModulePcdSet):
>-        if self.ConditionalPcds:
>-            self.GenerateReportDetail(File, ModulePcdSet, 1)
>-        if self.UnusedPcds:
>-            self.GenerateReportDetail(File, ModulePcdSet, 2)
>+        if not ModulePcdSet:
>+            if self.ConditionalPcds:
>+                self.GenerateReportDetail(File, ModulePcdSet, 1)
>+            if self.UnusedPcds:
>+                self.GenerateReportDetail(File, ModulePcdSet, 2)
>         self.GenerateReportDetail(File, ModulePcdSet)
>
>     ##
>     # Generate report for PCD information
>     #
>@@ -902,11 +903,11 @@ class PcdReport(object):
>         if ReportSubType == 1:
>             PcdDict = self.ConditionalPcds
>         elif ReportSubType == 2:
>             PcdDict = self.UnusedPcds
>
>-        if ModulePcdSet is None:
>+        if not ModulePcdSet:
>             FileWrite(File, gSectionStart)
>             if ReportSubType == 1:
>                 FileWrite(File, "Conditional Directives used by the build system")
>             elif ReportSubType == 2:
>                 FileWrite(File, "PCDs not used by modules or in conditional directives")
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel