From nobody Mon Feb 9 17:24:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1524868500372895.0594421435555; Fri, 27 Apr 2018 15:35:00 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C57DB207DF456; Fri, 27 Apr 2018 15:33:09 -0700 (PDT) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 C269F203B8C8F for ; Fri, 27 Apr 2018 15:33:02 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Apr 2018 15:33:02 -0700 Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.144]) by orsmga002.jf.intel.com with ESMTP; 27 Apr 2018 15:32:59 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,336,1520924400"; d="scan'208";a="54252853" From: Jaben Carsey To: edk2-devel@lists.01.org Date: Fri, 27 Apr 2018 15:32:43 -0700 Message-Id: <3ed1f73d339ca5239155a8aa51f7fdbb97731dbd.1524868034.git.jaben.carsey@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [edk2] [PATCH v1 29/42] BaseTools: AutoGen - refactor more functions only called in __init__ X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/AutoGen/IdfClassObject.py | 89 +++++++++----------- 1 file changed, 40 insertions(+), 49 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/= Source/Python/AutoGen/IdfClassObject.py index 82396d3744d5..7bc4e4ffb57b 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -66,61 +66,52 @@ EFI_HII_PACKAGE_TYPE_SYSTEM_END =3D 0xFF =20 class IdfFileClassObject(object): def __init__(self, FileList =3D []): - self.FileList =3D FileList self.ImageFilesDict =3D {} self.ImageIDList =3D [] - if len(self.FileList) > 0: - self.LoadIdfFiles(FileList) + for File in FileList: + if File is None: + EdkLogger.error("Image Definition File Parser", PARSER_ERR= OR, 'No Image definition file is given.') + self.File =3D File =20 - def LoadIdfFiles(self, FileList): - if len(FileList) > 0: - for File in FileList: - self.LoadIdfFile(File) + try: + IdfFile =3D open(LongFilePath(File.Path), mode=3D'r') + FileIn =3D IdfFile.read() + IdfFile.close() + except: + EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=3DFi= le) =20 - def LoadIdfFile(self, File =3D None): - if File is None: - EdkLogger.error("Image Definition File Parser", PARSER_ERROR, = 'No Image definition file is given.') - self.File =3D File + ImageFileList =3D [] + for Line in FileIn.splitlines(): + Line =3D Line.strip() + Line =3D StripComments(Line) + if len(Line) =3D=3D 0: + continue =20 - try: - IdfFile =3D open(LongFilePath(File.Path), mode=3D'r') - FileIn =3D IdfFile.read() - IdfFile.close() - except: - EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=3DFile) + LineNo =3D GetLineNo(FileIn, Line, False) + if not Line.startswith('#image '): + EdkLogger.error("Image Definition File Parser", PARSER= _ERROR, 'The %s in Line %s of File %s is invalid.' % (Line, LineNo, File.Pa= th)) =20 - ImageFileList =3D [] - for Line in FileIn.splitlines(): - Line =3D Line.strip() - Line =3D StripComments(Line) - if len(Line) =3D=3D 0: - continue - - LineNo =3D GetLineNo(FileIn, Line, False) - if not Line.startswith('#image '): - EdkLogger.error("Image Definition File Parser", PARSER_ERR= OR, 'The %s in Line %s of File %s is invalid.' % (Line, LineNo, File.Path)) - - if Line.find('#image ') >=3D 0: - LineDetails =3D Line.split() - Len =3D len(LineDetails) - if Len !=3D 3 and Len !=3D 4: - EdkLogger.error("Image Definition File Parser", PARSER= _ERROR, 'The format is not match #image IMAGE_ID [TRANSPARENT] ImageFileNam= e in Line %s of File %s.' % (LineNo, File.Path)) - if Len =3D=3D 4 and LineDetails[2] !=3D 'TRANSPARENT': - EdkLogger.error("Image Definition File Parser", PARSER= _ERROR, 'Please use the keyword "TRANSPARENT" to describe the transparency = setting in Line %s of File %s.' % (LineNo, File.Path)) - MatchString =3D gIdentifierPattern.match(LineDetails[1]) - if MatchString is None: - EdkLogger.error('Image Definition File Parser', FORMA= T_INVALID, 'The Image token name %s defined in Idf file %s contains the inv= alid character.' % (LineDetails[1], File.Path)) - if LineDetails[1] not in self.ImageIDList: - self.ImageIDList.append(LineDetails[1]) - else: - EdkLogger.error("Image Definition File Parser", PARSER= _ERROR, 'The %s in Line %s of File %s is already defined.' % (LineDetails[1= ], LineNo, File.Path)) - if Len =3D=3D 4: - ImageFile =3D ImageFileObject(LineDetails[Len-1], Line= Details[1], True) - else: - ImageFile =3D ImageFileObject(LineDetails[Len-1], Line= Details[1], False) - ImageFileList.append(ImageFile) - if ImageFileList: - self.ImageFilesDict[File] =3D ImageFileList + if Line.find('#image ') >=3D 0: + LineDetails =3D Line.split() + Len =3D len(LineDetails) + if Len !=3D 3 and Len !=3D 4: + EdkLogger.error("Image Definition File Parser", PA= RSER_ERROR, 'The format is not match #image IMAGE_ID [TRANSPARENT] ImageFil= eName in Line %s of File %s.' % (LineNo, File.Path)) + if Len =3D=3D 4 and LineDetails[2] !=3D 'TRANSPARENT': + EdkLogger.error("Image Definition File Parser", PA= RSER_ERROR, 'Please use the keyword "TRANSPARENT" to describe the transpare= ncy setting in Line %s of File %s.' % (LineNo, File.Path)) + MatchString =3D gIdentifierPattern.match(LineDetails[1= ]) + if MatchString is None: + EdkLogger.error('Image Definition File Parser', F= ORMAT_INVALID, 'The Image token name %s defined in Idf file %s contains the= invalid character.' % (LineDetails[1], File.Path)) + if LineDetails[1] not in self.ImageIDList: + self.ImageIDList.append(LineDetails[1]) + else: + EdkLogger.error("Image Definition File Parser", PA= RSER_ERROR, 'The %s in Line %s of File %s is already defined.' % (LineDetai= ls[1], LineNo, File.Path)) + if Len =3D=3D 4: + ImageFile =3D ImageFileObject(LineDetails[Len-1], = LineDetails[1], True) + else: + ImageFile =3D ImageFileObject(LineDetails[Len-1], = LineDetails[1], False) + ImageFileList.append(ImageFile) + if ImageFileList: + self.ImageFilesDict[File] =3D ImageFileList =20 def SearchImageID(ImageFileObject, FileList): if FileList =3D=3D []: --=20 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel