From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: liming.gao@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Wed, 07 Aug 2019 17:39:08 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Aug 2019 17:39:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,358,1559545200"; d="scan'208";a="174687813" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga008.fm.intel.com with ESMTP; 07 Aug 2019 17:39:08 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 7 Aug 2019 17:39:08 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 7 Aug 2019 17:39:07 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.15]) with mapi id 14.03.0439.000; Thu, 8 Aug 2019 08:39:06 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "Feng, Bob C" Subject: Re: [edk2-devel] [Patch 1/1] BaseTools: Fixed an issue that build raise exception Thread-Topic: [edk2-devel] [Patch 1/1] BaseTools: Fixed an issue that build raise exception Thread-Index: AQHVSQMNqyJ6Mrvcc0Ge7bf0J2rGBabwcVHw Date: Thu, 8 Aug 2019 00:39:06 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4CC468@SHSMSX104.ccr.corp.intel.com> References: <20190802072148.15256-1-bob.c.feng@intel.com> In-Reply-To: <20190802072148.15256-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----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 ; Feng, Bob C >Subject: [edk2-devel] [Patch 1/1] BaseTools: Fixed an issue that build ra= ise >exception > >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2047 > >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 >Signed-off-by: Bob Feng >--- > 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=3D"%s.%s" % (TokenSpaceGuidCName, TokenCName)) > GlobalData.BuildOptionPcd[i] =3D (TokenSpaceGuidCName, >TokenCName, FieldName, pcdvalue, ("build command options", 1)) > > if GlobalData.BuildOptionPcd: >+ inf_objs =3D [item for item in self._Bdb._CACHE_.values() if= item.Arch =3D=3D >self.Arch and item.MetaFile.Ext.lower() =3D=3D '.inf'] > for pcd in GlobalData.BuildOptionPcd: > (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, _= ) =3D >pcd >- for BuildData in self._Bdb._CACHE_.values(): >- if BuildData.Arch !=3D self.Arch: >- continue >- if BuildData.MetaFile.Ext =3D=3D '.dec' or BuildData= .MetaFile.Ext =3D=3D >'.dsc': >- continue >+ for BuildData in inf_objs: > for key in BuildData.Pcds: > PcdItem =3D BuildData.Pcds[key] > if (TokenSpaceGuidCName, TokenCName) =3D=3D >(PcdItem.TokenSpaceGuidCName, PcdItem.TokenCName) and FieldName >=3D=3D"": > PcdItem.DefaultValue =3D pcdvalue > PcdItem.PcdValueFromComm =3D pcdvalue >-- >2.20.1.windows.1 > > >