commit 84a52d4d030185a44f2d8736142c6f0b19c6e9b1
author Zhao, ZhiqiangX <zhiqiangx.zhao@intel.com> Tue Sep 04 15:51:05 2018 +0800
committer Liming Gao <liming.gao@intel.com> Wed Sep 12 11:25:23 2018 +0800
tree 873120d9c34c8e8ef3441bb57fabdbbbb7ddc4ad
parent 4c6fda33c8aafd76cad7631e5da955b916313436

BaseTools: SKU inheritance.

If the SkuB's parent SkuA is not in SKUID_IDENTIFIER, then
make SkuB inherit from SkuA as if the SKUID_INDENTIFIER
is ALL.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: ZhiqiangX Zhao <zhiqiangx.zhao@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

BaseTools/Source/Python/Workspace/DscBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 9c9dce4..88ba415 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1334,8 +1334,7 @@
 

         Pcds = AllPcds

         DefaultStoreMgr = DefaultStore(self.DefaultStores)

-        SkuIds = self.SkuIdMgr.AvailableSkuIdSet

-        SkuIds.update({TAB_DEFAULT:0})

+        SkuIds = self.SkuIds

         DefaultStores = {storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict}

 

         S_PcdSet = []

@@ -2145,7 +2144,7 @@
                 CApp = CApp + '  Initialize_%s_%s_%s_%s();\n' % (self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)

             else:

                 for SkuName in self.SkuIdMgr.SkuOverrideOrder():

-                    if SkuName not in Pcd.SkuOverrideValues:

+                    if SkuName not in self.SkuIdMgr.AvailableSkuIdSet:

                         continue

                     for DefaultStoreName in Pcd.SkuOverrideValues[SkuName]:

                         CApp = CApp + '  Initialize_%s_%s_%s_%s();\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)