From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web12.56945.1606723488964562144 for ; Mon, 30 Nov 2020 00:04:49 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: yuwei.chen@intel.com) IronPort-SDR: sqXu8HmyZZjoZG6cuJyCnZFqVLFx9hiGlvugsRtnZTySPTu9fM/3uWdEiFULGm6+ZLgZ/jP6Ce vgP1jlw79y3Q== X-IronPort-AV: E=McAfee;i="6000,8403,9820"; a="159650273" X-IronPort-AV: E=Sophos;i="5.78,381,1599548400"; d="scan'208";a="159650273" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 00:04:46 -0800 IronPort-SDR: kiBwmbv+qTnsAlAZlJFyOqwyTQSF8FzkGpMv3aCm8Q1A4vEDO891pwksuPY+VQGRUNznBXv09I E02omOJecQGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,381,1599548400"; d="scan'208";a="364120754" Received: from yuweipc.ccr.corp.intel.com ([10.239.158.34]) by fmsmga004.fm.intel.com with ESMTP; 30 Nov 2020 00:04:44 -0800 From: "Yuwei Chen" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH 1/1] BaseTools: Add comments in StructurePcd DSC file. Date: Mon, 30 Nov 2020 16:04:44 +0800 Message-Id: <20201130080444.1964-1-yuwei.chen@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently VFR files have variables comments which will not be added into StructurePcd.dsc file. Thus, it is not convenient for developer to Modify Pcds. To solve this problem, The comments will be 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scripts/ConvertFceToStructurePcd.py index aeda3ff26dfe..6b3a81c6a7be 100644 --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py @@ -278,6 +278,7 @@ class Config(object): part = [] for x in section[1:]: line=x.split('\n')[0] + comment = value_re.findall(line) # the string \\... in "Q...." line line=value_re.sub('',line) #delete \\... in "Q...." line list1=line.split(' ') value=self.value_parser(list1) @@ -289,7 +290,7 @@ class Config(object): if attribute[0] in ['0x3','0x7']: offset = int(offset[0], 16) #help = help_re.findall(x) - text = offset, name[0], guid[0], value, attribute[0] + text = offset, name[0], guid[0], value, attribute[0], comment[0] part.append(text) return(part) @@ -479,10 +480,10 @@ class mainprocess(object): tmp_id=[id_key] #['0_0',[(struct,[name...]),(struct,[name...])]] tmp_info={} #{name:struct} for section in config_dict[id_key]: - c_offset,c_name,c_guid,c_value,c_attribute = section + c_offset,c_name,c_guid,c_value,c_attribute,c_comment = section if c_name in efi_dict: struct = efi_dict[c_name] - title='%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='%s%s|L"%s"|%s|0x00||%s #%s\n'%(PCD_NAME,c_name,c_name,self.guid.guid_parser(c_guid),self.attribute_dict[c_attribute],c_comment) if struct in all_struct: lstfile = stru_lst[struct] struct_dict=all_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=struct_dict[c_offset] - info = "%s%s.%s|%s\n"%(PCD_NAME,c_name,offset_name,c_value) + info = "%s%s.%s|%s #%s\n"%(PCD_NAME,c_name,offset_name,c_value,c_comment) inf = "%s%s\n"%(PCD_NAME,c_name) inf_list.append(inf) tmp_info[info]=title -- 2.27.0.windows.1