From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.49209.1606207251905801365 for ; Tue, 24 Nov 2020 00:40:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: yuwei.chen@intel.com) IronPort-SDR: DEjR37XLPE/NV3YEvNDktX8OROxivOJDHYTLqE8jkYPRCXh+nF7VYtd3xqEmwRI+ikN/5CfwO7 jGCaNHFv03+w== X-IronPort-AV: E=McAfee;i="6000,8403,9814"; a="233519739" X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="233519739" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 00:40:50 -0800 IronPort-SDR: k3GRw/DkRSvL380pGsTZVK0U/rl7mQCIkKcX/NyyS0ZoJQAghdoXFZws4xT8QvufU3dXgf5vJt JnZiZd5UVAvQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="361785788" Received: from yuweipc.ccr.corp.intel.com ([10.239.158.34]) by fmsmga004.fm.intel.com with ESMTP; 24 Nov 2020 00:40:25 -0800 From: "Yuwei Chen" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [Patch v2 1/1] BaseTools: Collect full Header files for struct finding. Date: Tue, 24 Nov 2020 16:40:23 +0800 Message-Id: <20201124084023.1579-1-yuwei.chen@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently, only parts of the Header files can be collected which caused some struct definition can not be found. To solve this issue, Header files full collection has been added in this file to support the struct finding. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yuwei Chen --- BaseTools/Scripts/ConvertFceToStructurePcd.py | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/BaseTools/Scripts/ConvertFceToStructurePcd.py b/BaseTools/Scripts/ConvertFceToStructurePcd.py index 89e6a727a201..aeda3ff26dfe 100644 --- a/BaseTools/Scripts/ConvertFceToStructurePcd.py +++ b/BaseTools/Scripts/ConvertFceToStructurePcd.py @@ -370,7 +370,7 @@ class PATH(object): def __init__(self,path): self.path=path self.rootdir=self.get_root_dir() - self.usefuldir=[] + self.usefuldir=set() self.lstinf = {} for path in self.rootdir: for o_root, o_dir, o_file in os.walk(os.path.join(path, "OUTPUT"), topdown=True, followlinks=False): @@ -381,7 +381,7 @@ class PATH(object): for LST in l_file: if os.path.splitext(LST)[1] == '.lst': self.lstinf[os.path.join(l_root, LST)] = os.path.join(o_root, INF) - self.usefuldir.append(path) + self.usefuldir.add(path) def get_root_dir(self): rootdir=[] @@ -410,7 +410,7 @@ class PATH(object): def header(self,struct): header={} - head_re = re.compile('typedef.*} %s;[\n]+(.*?)(?:typedef|formset)'%struct,re.M|re.S) + head_re = re.compile('typedef.*} %s;[\n]+(.*)(?:typedef|formset)'%struct,re.M|re.S) head_re2 = re.compile(r'#line[\s\d]+"(\S+h)"') for i in list(self.lstinf.keys()): with open(i,'r') as lst: @@ -421,9 +421,21 @@ class PATH(object): if head: format = head[0].replace('\\\\','/').replace('\\','/') name =format.split('/')[-1] - head = self.makefile(name).replace('\\','/') - header[struct] = head + head = self.headerfileset.get(name) + if head: + head = head.replace('\\','/') + header[struct] = head return header + @property + def headerfileset(self): + headerset = dict() + for root,dirs,files in os.walk(self.path): + for file in files: + if os.path.basename(file) == 'deps.txt': + with open(os.path.join(root,file),"r") as fr: + for line in fr.readlines(): + headerset[os.path.basename(line).strip()] = line.strip() + return headerset def makefile(self,filename): re_format = re.compile(r'DEBUG_DIR.*(?:\S+Pkg)\\(.*\\%s)'%filename) @@ -433,6 +445,7 @@ class PATH(object): dir = re_format.findall(read) if dir: return dir[0] + return None class mainprocess(object): @@ -479,7 +492,7 @@ class mainprocess(object): WARNING.append("Warning: No for struct %s"%struct) title2 = '%s%s|{0}|%s|0xFCD00000{\n \n %s\n \n%s\n}\n' % (PCD_NAME, c_name, struct, '', self.LST.package()[self.lst_dict[lstfile]]) header_list.append(title2) - else: + elif struct not in lst._ignore: struct_dict ={} print("ERROR: Struct %s can't found in lst file" %struct) ERRORMSG.append("ERROR: Struct %s can't found in lst file" %struct) -- 2.27.0.windows.1