From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.3748.1607993756668441065 for ; Mon, 14 Dec 2020 16:55:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=wzTLwB5E; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: bob.c.feng@intel.com) IronPort-SDR: e2EdiGWx+6FTK4Fm2A75PF9qP7ywJf+SG0jhFSFXXiAy74xBHEEYykQrJ3e40M68fdQ9sbkw2u UxJ7k7KgcUkg== X-IronPort-AV: E=McAfee;i="6000,8403,9835"; a="259533032" X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="259533032" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 16:55:55 -0800 IronPort-SDR: NFACqWpbrxFvpI/dHMIh4mwsq1glHpCr8IBiaBZCns6YHHxriL19hqdtZ014ZeOXpcbBZpQsOg pUPFVPVtuXsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="411500665" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by orsmga001.jf.intel.com with ESMTP; 14 Dec 2020 16:55:54 -0800 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 14 Dec 2020 16:55:54 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 14 Dec 2020 16:55:54 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.103) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 14 Dec 2020 16:55:52 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KOJavKskheZYDYw5IBmiMSx9COuZN9PzRjHoMa/tWOWdqD0Pr0EqKcVUfihV8ly7ZxX/LlM0olH3iXXfqAF9NQWsbIsIpYZv4YwywZlo85aEBHzk5U1T9gO9wB96oO6RBKoQ3XIfBtVpsVs10XsKkD/VQPA8Cu5jtFQv37HW31HpuQ8VBaxxiytqRSXFCcX4Q1LXWUPZKCDVoE4lx8ALqj64RHzjXs3l6FFlFFe63UoABgDPiq1r14lZlCnKuINTRs/sRkXyFMbwYe6YLf8mAcYsHE0HjqZrPw5dT+Zmm7GfHFfzgNbliKGc8X5MekA2aWEQdHALDpIyB4qrmG8Vow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZObDJMf134ZiBdWUBHnqLRb1/94dHx5WqfHhePz1rrc=; b=d5dnJoz2GF7DFsxXKDOZd1PGuC+E8yZbWa0dhJ45z2vchM7+RKeUZ8fOe31fJJi9KERCFxyfm9wlc/cE2WV3wabl5hQHf5HQ3NVc7gQnt5jX7OV1VPtuINdW/1nmZvX0YzJuEmKFr4dbBG7bhk8sYvsXsX6BCpNelafr+B8ls0yCT0LrIbQTt3R/4dkHOlm2kFXiWSOVI80UO42+t9uLQv0Si7iuNzwHnWrlOA6y8xjCEVI+Dup9HucDO2egkAytZ9jX0Po77nlSt+ND9j/qNvJssJoyaMVILuWxBYEztR7XUeJQimUVE9bsQrz+6wu5Z4VlUq9QAsCzgoFqSA2Gzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZObDJMf134ZiBdWUBHnqLRb1/94dHx5WqfHhePz1rrc=; b=wzTLwB5Ea2hSukGcV441edLSlF0tR5J/NgIZxWY4ogoCSwSh3NkG4veuhx6oZkVjvSlEB8DQgHgckWl4EF84rTAKzrmw3NlEJqHrU7dTK5Mn/QScT2clVUIVNOShpnOFLespXHA4zJpSArFRiTalufNl/zVOSRSKeSCUgGSvED0= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB3148.namprd11.prod.outlook.com (2603:10b6:5:6f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12; Tue, 15 Dec 2020 00:55:49 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb%3]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 00:55:49 +0000 From: "Bob Feng" To: "Chen, Christine" , "devel@edk2.groups.io" CC: Liming Gao Subject: Re: [Patch v3 1/1] BaseTools: Add comments in StructurePcd DSC file. Thread-Topic: [Patch v3 1/1] BaseTools: Add comments in StructurePcd DSC file. Thread-Index: AQHWzG6xSuRyoKoKQEmYxL9gnsU/y6n3YRWg Date: Tue, 15 Dec 2020 00:55:47 +0000 Message-ID: References: <20201207075754.1240-1-yuwei.chen@intel.com> In-Reply-To: <20201207075754.1240-1-yuwei.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: eff2d9f1-9cb2-4712-b1bd-08d8a0942a0c x-ms-traffictypediagnostic: DM6PR11MB3148: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1388; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9mXxtPagTWe3XnIJfOPgIYXqo7AgPOkWbehIQPUnfaKOS6gD0BZ5OFNHhUMHO19uPF+z8KBVJ0rbuY57M6V5eKC7iSOLjiBnLYzGPmUEawjY3GfoCpkuFmsRPfcZU9dcYy7rx8HshqW9kmx6j2wXQZdl1gpMzCmA+YJiUYWI3KtE49ciJ0H2aIS2VsY/q4c6rYgKGci8g2OSJ82RXLTA7L1K+JSz7QcZP4N4533Mqdjx5C0WEPiFmXqG1KzsNuFwXafiYgh0Fds7Ul9MIqzAU1eDa+1BgSZIQXuFD/XcG1jjPxanqJy5KaUUOvdzozIlUx0RHhqubZrlK6GaLQbmZQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(346002)(136003)(366004)(6506007)(8676002)(66476007)(52536014)(66946007)(66446008)(4326008)(64756008)(26005)(9686003)(186003)(66556008)(55016002)(110136005)(2906002)(5660300002)(83380400001)(71200400001)(76116006)(7696005)(53546011)(508600001)(86362001)(33656002)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?7RoKI9poUIqTTHfMJj5BIhP3kVCl9VrSLv4UdlngrQ2itOcmEA/orA6Ltq+n?= =?us-ascii?Q?eEKOkC5WsmRBAJ+3Qa/DeBx41zIdfLlJs+pfdm7XMxWoyLE8zGUq5PkNBEzq?= =?us-ascii?Q?Ke+Eeqbi4MO3TwxqeK4s+Mp9becARDPm4rJmczeuh6/N4RJWxXPJY1ByASbs?= =?us-ascii?Q?Bu/ZGtO+K0b3gUXvklVWgknFiovNQnY2puSchAqcpFpbTjoqY6kvvVh7Xb56?= =?us-ascii?Q?8Zx4XBTPvsWNY/XZlBK15Sz3urGc3hDG3GXiih/TjM7ouobG1gAJuirJ83s7?= =?us-ascii?Q?6PBTcG1fC1Tsgc9In2oVNxjDBFvZJOFDKahpLu8u0Z5EP/Gp47J8ntnSGzdl?= =?us-ascii?Q?zSrziw4h9C8Zr8aR9+n1R7HReSeIxZTPVWQ9WYB5bfpGx4RO8xRl55Q0IHdu?= =?us-ascii?Q?93vg2JAvfV/4w/UmJEhvLIbeO/Y4oSbKS0Sfr2ByQ07GY6pCQNEFO2a5T6H/?= =?us-ascii?Q?iO8QsOVA/c+nPnZQ6XSdgnmehSor3ULiemtTjaTv5tw2RLyDmfVXkenfykkb?= =?us-ascii?Q?BlYmO0bFCmV+zJhNx38ImGa2vm3M5M/kXLSWn3xVVgj4Az3Pwg0fcVABgY8a?= =?us-ascii?Q?AuMz9FOwusgBktNc5Kbkvd9JxoA7m+h/UupziFasucMKgrlqlm5cX+6XB7Rv?= =?us-ascii?Q?LCxW/gkEzcqAzk/qjTKMEWQA5WYxLQ6a0vg98wCh1pOnG0i/r1hcyKzisPtw?= =?us-ascii?Q?u/HvC2b/WoijaNsqJkopdFzkNpg5fKgw2DOSsUzx6RikNj4UVDvfOPxBReT2?= =?us-ascii?Q?n+wtqGOYCCx8EcQC92ixUvHXYF5DiYtT0B4XdBWtK57M7t4Ex5pwzUyf4ERc?= =?us-ascii?Q?tEAOSURWSmV0vGYT9V1cg6/k+X/pk/0QCM1thPbed7PA/raZM0ZfjXX9Bmgf?= =?us-ascii?Q?NxXszfPg7jWcQX4+L8SJswKRGLE/Z27NcJE1kLETHW7+TiD/gawGaDURGoiu?= =?us-ascii?Q?EgJHBULEfbuUAfQyx1SbMJbw1ixZ7qtfeYVqPs24bbY=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eff2d9f1-9cb2-4712-b1bd-08d8a0942a0c X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2020 00:55:47.9082 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: NBAtUCGJd4SWEDT1L9T1u3j1SyZPmB5bsd71LfmuV+upRwZws0XXoEkmjPAcAHoemq7mqEz/BM0RAM5nbDumFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3148 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng =20 -----Original Message----- From: Chen, Christine =20 Sent: Monday, December 7, 2020 3:58 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao Subject: [Patch v3 1/1] BaseTools: Add comments in StructurePcd DSC file. Currently VFR files have variables comments which will not be added into St= ructurePcd.dsc file. Thus, it is not convenient for developer to Modify Pcd= s. To solve this problem, The comments will be modified to user friendly fo= rmat and added after the corresponding Pcd values in StructurePcd.dsc file. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yuwei Chen --- BaseTools/Scripts/ConvertFceToStructurePcd.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scri= pts/ConvertFceToStructurePcd.py index aeda3ff26dfe..867660fba9cf 100644 --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py @@ -52,6 +52,7 @@ infstatement =3D '''[Pcd] =20 SECTION=3D'PcdsDynamicHii' PCD_NAME=3D'gStructPcdTokenSpaceGuid.Pcd' +Max_Pcd_Len =3D 100 =20 WARNING=3D[] ERRORMSG=3D[] @@ -278,6 +279,9 @@ class Config(object): part =3D [] for x in section[1:]: line=3Dx.split('\n')[0] + comment_list =3D value_re.findall(line) # the string \\... in "Q..= .." line + comment_list[0] =3D comment_list[0].replace('//', '') + comment =3D comment_list[0].strip() line=3Dvalue_re.sub('',line) #delete \\... in "Q...." line list1=3Dline.split(' ') value=3Dself.value_parser(list1) @@ -289,7 +293,7 @@ class Config(object): if attribute[0] in ['0x3','0x7']: offset =3D int(offset[0], 16) #help =3D help_re.findall(x) - text =3D offset, name[0], guid[0], value, attribute[0] + text =3D offset, name[0], guid[0], value, attribute[0],=20 + comment part.append(text) return(part) =20 @@ -479,7 +483,7 @@ class mainprocess(object): tmp_id=3D[id_key] #['0_0',[(struct,[name...]),(struct,[name...])]] tmp_info=3D{} #{name:struct} for section in config_dict[id_key]: - c_offset,c_name,c_guid,c_value,c_attribute =3D section + c_offset,c_name,c_guid,c_value,c_attribute,c_comment =3D section if c_name in efi_dict: struct =3D efi_dict[c_name] title=3D'%s%s|L"%s"|%s|0x00||%s\n'%(PCD_NAME,c_name,c_name,self.= guid.guid_parser(c_guid),self.attribute_dict[c_attribute]) @@ -499,9 +503,14 @@ class mainprocess(object): if c_offset in struct_dict: offset_name=3Dstruct_dict[c_offset] info =3D "%s%s.%s|%s\n"%(PCD_NAME,c_name,offset_name,c_value) + blank_length =3D Max_Pcd_Len - len(info) + if blank_length <=3D 0: + info_comment =3D "%s%s.%s|%s%s# %s\n"%(PCD_NAME,c_name,off= set_name,c_value," ",c_comment) + else: + info_comment =3D "%s%s.%s|%s%s#=20 + %s\n"%(PCD_NAME,c_name,offset_name,c_value,blank_length*" ",c_comment) inf =3D "%s%s\n"%(PCD_NAME,c_name) inf_list.append(inf) - tmp_info[info]=3Dtitle + tmp_info[info_comment]=3Dtitle else: print("ERROR: Can't find offset %s with struct name %s"%(c_off= set,struct)) ERRORMSG.append("ERROR: Can't find offset %s with name %s"%(c_= offset,struct)) -- 2.27.0.windows.1