From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web10.56588.1606721786646297950 for ; Sun, 29 Nov 2020 23:36:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Mon, 30 Nov 2020 15:36:20 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Yuwei Chen'" , Cc: "'Bob Feng'" References: <20201130063149.216-1-yuwei.chen@intel.com> In-Reply-To: <20201130063149.216-1-yuwei.chen@intel.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0ggMS8xXSBCYXNlVG9vbHM6IEFkZCBjb21taXRzIGluIGdlbmVyYXRlZCBTdHJ1Y3R1cmVQY2QgZmlsZXMu?= Date: Mon, 30 Nov 2020 15:36:23 +0800 Message-ID: <004e01d6c6eb$80e47b80$82ad7280$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQJdPTg8mvkY0ajBiuPXRC9q0zExzajTXHgw Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Do you mean the comments in VFR? > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Yuwei Chen > =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA11=D4=C230=C8=D5 14:32 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Bob Feng ; Liming Gao > > =D6=F7=CC=E2: [PATCH 1/1] BaseTools: Add commits in generated = StructurePcd files. >=20 > Currently the generated StructurePcd.dsc file does not > have the commits wrote in VFR files, which is not convenient > for developer to modify. To solve this problem, The commits > will be added after the Pcd values in StructurePcd.dsc file. >=20 > Cc: Bob Feng > Cc: Liming Gao > Signed-off-by: Yuwei Chen > --- > BaseTools/Scripts/ConvertFceToStructurePcd.py | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) >=20 > diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py > b/BaseTools/Scripts/ConvertFceToStructurePcd.py > index aeda3ff26dfe..45762f579b83 100644 > --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py > +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py > @@ -278,6 +278,7 @@ class Config(object): > part =3D [] > for x in section[1:]: > line=3Dx.split('\n')[0] > + commit =3D value_re.findall(line) # the string \\... in = "Q...." line > line=3Dvalue_re.sub('',line) #delete \\... in "Q...." line > list1=3Dline.split(' ') > value=3Dself.value_parser(list1) > @@ -289,7 +290,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], commit[0] > part.append(text) > return(part) >=20 > @@ -479,10 +480,10 @@ 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_commit =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]) > + title=3D'%s%s|L"%s"|%s|0x00||%s > = #%s\n'%(PCD_NAME,c_name,c_name,self.guid.guid_parser(c_guid),self.attrib > ute_dict[c_attribute],c_commit) > if struct in all_struct: > lstfile =3D stru_lst[struct] > struct_dict=3Dall_struct[struct] > @@ -498,7 +499,7 @@ class mainprocess(object): > ERRORMSG.append("ERROR: Struct %s can't found in lst > file" %struct) > 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) > + info =3D "%s%s.%s|%s > #%s\n"%(PCD_NAME,c_name,offset_name,c_value,c_commit) > inf =3D "%s%s\n"%(PCD_NAME,c_name) > inf_list.append(inf) > tmp_info[info]=3Dtitle > -- > 2.27.0.windows.1