From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2F74B2194EB70 for ; Thu, 14 Feb 2019 06:31:35 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2019 06:31:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,369,1544515200"; d="scan'208";a="138605157" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga001.jf.intel.com with ESMTP; 14 Feb 2019 06:31:34 -0800 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 14 Feb 2019 06:31:33 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 14 Feb 2019 06:31:33 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.109]) with mapi id 14.03.0415.000; Thu, 14 Feb 2019 22:31:31 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch 2/3] BaseTools: Fixed an issue about StructurePcd Thread-Index: AQHUvFWflythPGIOqkKWyO1t9YN2nqXfa0JQ Date: Thu, 14 Feb 2019 14:31:31 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3DEBBC@SHSMSX104.ccr.corp.intel.com> References: <20190204064802.14616-1-bob.c.feng@intel.com> <20190204064802.14616-2-bob.c.feng@intel.com> In-Reply-To: <20190204064802.14616-2-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNWJlNWUzYTgtNmE2Ni00ZjU0LThjYTItMTRhYzJkNWQxMGEwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidWlhTGZNZWphRGtmS1FiclJiS1lrdDJQYXNCOTFPMUdPMmszdDdJUWIxUmw5VGdlaUk5Nm1JYitVSFloSUZLNSJ9 dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch 2/3] BaseTools: Fixed an issue about StructurePcd X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Feb 2019 14:31:35 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Fe= ng, Bob C > Sent: Monday, February 4, 2019 2:48 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [edk2] [Patch 2/3] BaseTools: Fixed an issue about StructurePcd >=20 > If use a structure pcd in fdf, build tool crash > This is a regression issue introduced by py3 patch set. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/Base= Tools/Source/Python/Workspace/BuildClassObject.py > index cff77a71ae..41759b8785 100644 > --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py > +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py > @@ -268,10 +268,11 @@ class StructurePcd(PcdClassObject): > self.PkgPath =3D "" > self.DefaultValueFromDec =3D "" > self.ValueChain =3D set() > self.PcdFieldValueFromComm =3D OrderedDict() > self.PcdFieldValueFromFdf =3D OrderedDict() > + self.DefaultFromDSC=3DNone > def __repr__(self): > return self.TypeName >=20 > def AddDefaultValue (self, FieldName, Value, FileName=3D"", LineNo= =3D0,DimensionAttr =3D"-1"): > if DimensionAttr not in self.DefaultValues: > @@ -324,11 +325,10 @@ class StructurePcd(PcdClassObject): > if isinstance(PcdObject, StructurePcd): > self.StructuredPcdIncludeFile =3D PcdObject.StructuredPcdInc= ludeFile if PcdObject.StructuredPcdIncludeFile else > self.StructuredPcdIncludeFile > self.PackageDecs =3D PcdObject.PackageDecs if PcdObject.Pack= ageDecs else self.PackageDecs > self.DefaultValues =3D PcdObject.DefaultValues if PcdObject.= DefaultValues else self.DefaultValues > self.PcdMode =3D PcdObject.PcdMode if PcdObject.PcdMode else= self.PcdMode > - self.DefaultFromDSC=3DNone > self.DefaultValueFromDec =3D PcdObject.DefaultValueFromDec i= f PcdObject.DefaultValueFromDec else > self.DefaultValueFromDec > self.SkuOverrideValues =3D PcdObject.SkuOverrideValues if Pc= dObject.SkuOverrideValues else self.SkuOverrideValues > self.StructName =3D PcdObject.DatumType if PcdObject.DatumTy= pe else self.StructName > self.PcdDefineLineNo =3D PcdObject.PcdDefineLineNo if PcdObj= ect.PcdDefineLineNo else self.PcdDefineLineNo > self.PkgPath =3D PcdObject.PkgPath if PcdObject.PkgPath else= self.PkgPath > -- > 2.18.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel