From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 89238211B6C2B for ; Wed, 16 Jan 2019 17:50:12 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 17:50:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="292182863" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 16 Jan 2019 17:50:11 -0800 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 16 Jan 2019 17:50:11 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 16 Jan 2019 17:50:11 -0800 Received: from shsmsx152.ccr.corp.intel.com ([169.254.6.44]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.160]) with mapi id 14.03.0415.000; Thu, 17 Jan 2019 09:50:09 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser. Thread-Index: AQHUrMlkxrQ9qW4IBUisyUbG2di1tqWytFzg Date: Thu, 17 Jan 2019 01:50:08 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3B3784@SHSMSX152.ccr.corp.intel.com> References: <20190115115633.26424-1-bob.c.feng@intel.com> In-Reply-To: <20190115115633.26424-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 01:50:12 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Feng, Bob C >Sent: Tuesday, January 15, 2019 7:57 PM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser. > >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1350 >Remove unused EDK_SOURCE keyword from Inf Parser. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >Tested-by: Laszlo Ersek >--- > .../Source/Python/Workspace/InfBuildData.py | 34 ++++--------------- > 1 file changed, 7 insertions(+), 27 deletions(-) > >diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py >b/BaseTools/Source/Python/Workspace/InfBuildData.py >index 02d6c1c756..709854de1e 100644 >--- a/BaseTools/Source/Python/Workspace/InfBuildData.py >+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py >@@ -634,38 +634,18 @@ class InfBuildData(ModuleBuildClassObject): > > Macros =3D self._Macros > Macros['PROCESSOR'] =3D GlobalData.gEdkGlobal.get('PROCESSOR', >self._Arch) > RecordList =3D self._RawData[MODEL_EFI_INCLUDE, self._Arch, >self._Platform] > for Record in RecordList: >- if Record[0].find('EDK_SOURCE') > -1: >- File =3D NormPath(Record[0], self._Macros) >- if File[0] =3D=3D '.': >- File =3D os.path.join(self._ModuleDir, File) >- else: >- File =3D os.path.join(GlobalData.gWorkspace, File) >- File =3D RealPath(os.path.normpath(File)) >- if File: >- RetVal.append(File) >- >- # TRICK: let compiler to choose correct header file >- File =3D NormPath(Record[0], self._Macros) >- if File[0] =3D=3D '.': >- File =3D os.path.join(self._ModuleDir, File) >- else: >- File =3D os.path.join(GlobalData.gWorkspace, File) >- File =3D RealPath(os.path.normpath(File)) >- if File: >- RetVal.append(File) >+ File =3D NormPath(Record[0], Macros) >+ if File[0] =3D=3D '.': >+ File =3D os.path.join(self._ModuleDir, File) > else: >- File =3D NormPath(Record[0], Macros) >- if File[0] =3D=3D '.': >- File =3D os.path.join(self._ModuleDir, File) >- else: >- File =3D mws.join(GlobalData.gWorkspace, File) >- File =3D RealPath(os.path.normpath(File)) >- if File: >- RetVal.append(File) >+ File =3D mws.join(GlobalData.gWorkspace, File) >+ File =3D RealPath(os.path.normpath(File)) >+ if File: >+ RetVal.append(File) > return RetVal > > ## Retrieve packages this module depends on > @cached_property > def Packages(self): >-- >2.19.1.windows.1