[Patch 1/1] BaseTools: Fixed an issue that build raise exception

[Patch 1/1] BaseTools: Fixed an issue that build raise exception

[Bob Feng]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2047

Build raise exception if there is libraryclass
missing in dsc file and --pcd build option is used.

Build should report the missing libraryclass but not
a call stack.

This patch is going to fix it.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Workspace/DscBuildData.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 620e48fa7f59..3ec1a35bfa3f 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1073,17 +1073,14 @@ class DscBuildData(PlatformBuildClassObject):
                     if not IsValid:
                         EdkLogger.error("build", FORMAT_INVALID, Cause, ExtraData="%s.%s" % (TokenSpaceGuidCName, TokenCName))
                 GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, ("build command options", 1))
 
         if GlobalData.BuildOptionPcd:
+            inf_objs = [item for item in self._Bdb._CACHE_.values() if item.Arch == self.Arch and item.MetaFile.Ext.lower() == '.inf']
             for pcd in GlobalData.BuildOptionPcd:
                 (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, _) = pcd
-                for BuildData in self._Bdb._CACHE_.values():
-                    if BuildData.Arch != self.Arch:
-                        continue
-                    if BuildData.MetaFile.Ext == '.dec' or BuildData.MetaFile.Ext == '.dsc':
-                        continue
+                for BuildData in inf_objs:
                     for key in BuildData.Pcds:
                         PcdItem = BuildData.Pcds[key]
                         if (TokenSpaceGuidCName, TokenCName) == (PcdItem.TokenSpaceGuidCName, PcdItem.TokenCName) and FieldName =="":
                             PcdItem.DefaultValue = pcdvalue
                             PcdItem.PcdValueFromComm = pcdvalue
-- 
2.20.1.windows.1

Re: [edk2-devel] [Patch 1/1] BaseTools: Fixed an issue that build raise exception

[Liming Gao]

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

>-----Original Message-----
>From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>Bob Feng
>Sent: Friday, August 02, 2019 3:22 PM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [edk2-devel] [Patch 1/1] BaseTools: Fixed an issue that build raise
>exception
>
>BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2047
>
>Build raise exception if there is libraryclass
>missing in dsc file and --pcd build option is used.
>
>Build should report the missing libraryclass but not
>a call stack.
>
>This patch is going to fix it.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/Workspace/DscBuildData.py | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>b/BaseTools/Source/Python/Workspace/DscBuildData.py
>index 620e48fa7f59..3ec1a35bfa3f 100644
>--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>@@ -1073,17 +1073,14 @@ class DscBuildData(PlatformBuildClassObject):
>                     if not IsValid:
>                         EdkLogger.error("build", FORMAT_INVALID, Cause,
>ExtraData="%s.%s" % (TokenSpaceGuidCName, TokenCName))
>                 GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName,
>TokenCName, FieldName, pcdvalue, ("build command options", 1))
>
>         if GlobalData.BuildOptionPcd:
>+            inf_objs = [item for item in self._Bdb._CACHE_.values() if item.Arch ==
>self.Arch and item.MetaFile.Ext.lower() == '.inf']
>             for pcd in GlobalData.BuildOptionPcd:
>                 (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, _) =
>pcd
>-                for BuildData in self._Bdb._CACHE_.values():
>-                    if BuildData.Arch != self.Arch:
>-                        continue
>-                    if BuildData.MetaFile.Ext == '.dec' or BuildData.MetaFile.Ext ==
>'.dsc':
>-                        continue
>+                for BuildData in inf_objs:
>                     for key in BuildData.Pcds:
>                         PcdItem = BuildData.Pcds[key]
>                         if (TokenSpaceGuidCName, TokenCName) ==
>(PcdItem.TokenSpaceGuidCName, PcdItem.TokenCName) and FieldName
>=="":
>                             PcdItem.DefaultValue = pcdvalue
>                             PcdItem.PcdValueFromComm = pcdvalue
>--
>2.20.1.windows.1
>
>
>