BaseTools: Report Structure PCD value and SKU, DefaultStore info

https://bugzilla.tianocore.org/show_bug.cgi?id=706
Add Structure PCD support for Build report. Structure PCD field value described
in DEC/DSC will be display in build report. And, PCD value for each SKU and
Default store will also be shown in build report.

Contributed-under: TianoCore Contribution Agreement 1.1
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

2 files changed, 10 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index 57ba0546ed..f7d4d577f9 100644
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -24,6 +24,7 @@ gOptions = None
 gCaseInsensitive = False

 gAllFiles = None

 gCommand = None

+gSKUID_CMD = None

 

 gGlobalDefines = {}

 gPlatformDefines = {}

@@ -39,6 +40,8 @@ gCommandMaxLength = 4096
 # for debug trace purpose when problem occurs

 gProcessingFile = ''

 gBuildingModule = ''

+gSkuids = []

+gDefaultStores = []

 

 ## Regular expression for matching macro used in DSC/DEC/INF file inclusion

 gMacroRefPattern = re.compile("\$\(([A-Z][_A-Z0-9]*)\)", re.UNICODE)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 2ff8516469..a2c6a6a0fb 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -2149,9 +2149,6 @@ class SkuClass():
                 EdkLogger.error("build", PARAMETER_INVALID,

                             ExtraData = "SKU-ID [%s] is not supported by the platform. [Valid SKU-ID: %s]"

                                       % (k, " | ".join(SkuIds.keys())))

-        if len(self.SkuIdSet) == 2 and 'DEFAULT' in self.SkuIdSet and SkuIdentifier != 'ALL':

-            self.SkuIdSet.remove('DEFAULT')

-            self.SkuIdNumberSet.remove('0U')

         for each in self.SkuIdSet:

             if each in SkuIds:

                 self.AvailableSkuIds[each] = SkuIds[each][0]

@@ -2161,6 +2158,13 @@ class SkuClass():
                                       % (each, " | ".join(SkuIds.keys())))

         if self.SkuUsageType != self.SINGLE:

             self.AvailableSkuIds.update({'DEFAULT':0, 'COMMON':0})

+        if self.SkuIdSet:

+            GlobalData.gSkuids = (self.SkuIdSet)

+            if 'COMMON' in GlobalData.gSkuids:

+                GlobalData.gSkuids.remove('COMMON')

+            if GlobalData.gSkuids:

+                GlobalData.gSkuids.sort()

+

     def GetNextSkuId(self, skuname):

         if not self.__SkuInherit:

             self.__SkuInherit = {}