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.31; helo=mga06.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 50F3F211B6C2B for ; Wed, 16 Jan 2019 17:50:47 -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 orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 17:50:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="292183081" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 16 Jan 2019 17:50:46 -0800 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) 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:46 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 16 Jan 2019 17:50:45 -0800 Received: from shsmsx152.ccr.corp.intel.com ([169.254.6.44]) by shsmsx102.ccr.corp.intel.com ([169.254.2.63]) with mapi id 14.03.0415.000; Thu, 17 Jan 2019 09:50:43 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Remove EDK_SOURCE keyword from ECC Tool Thread-Index: AQHUrMHk9eY4r1pxJU2nFtS+H0NAtKWytJbw Date: Thu, 17 Jan 2019 01:50:42 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3B379A@SHSMSX152.ccr.corp.intel.com> References: <20190115110248.15416-1-bob.c.feng@intel.com> In-Reply-To: <20190115110248.15416-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] BaseTools: Remove EDK_SOURCE keyword from ECC Tool 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:47 -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:03 PM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch] BaseTools: Remove EDK_SOURCE keyword from ECC Tool > >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1350 >Remove EDK_SOURCE keyword from ECC Tool. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/Ecc/EccMain.py | 27 ------------------- > .../Ecc/MetaFileWorkspace/MetaFileParser.py | 20 -------------- > 2 files changed, 47 deletions(-) > >diff --git a/BaseTools/Source/Python/Ecc/EccMain.py >b/BaseTools/Source/Python/Ecc/EccMain.py >index 5f9e497e37..0f97447751 100644 >--- a/BaseTools/Source/Python/Ecc/EccMain.py >+++ b/BaseTools/Source/Python/Ecc/EccMain.py >@@ -66,47 +66,20 @@ class Ecc(object): > > # Parse the options and args > self.ParseOption() > EdkLogger.info(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtim= e()) >+ "[00:00]" + "\n") > >- # >- # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always >point to ECP >- # > WorkspaceDir =3D >os.path.normcase(os.path.normpath(os.environ["WORKSPACE"])) > os.environ["WORKSPACE"] =3D WorkspaceDir > > # set multiple workspace > PackagesPath =3D os.getenv("PACKAGES_PATH") > mws.setWs(WorkspaceDir, PackagesPath) > >- if "ECP_SOURCE" not in os.environ: >- os.environ["ECP_SOURCE"] =3D mws.join(WorkspaceDir, >GlobalData.gEdkCompatibilityPkg) >- if "EFI_SOURCE" not in os.environ: >- os.environ["EFI_SOURCE"] =3D os.environ["ECP_SOURCE"] >- if "EDK_SOURCE" not in os.environ: >- os.environ["EDK_SOURCE"] =3D os.environ["ECP_SOURCE"] >- >- # >- # Unify case of characters on case-insensitive systems >- # >- EfiSourceDir =3D >os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"])) >- EdkSourceDir =3D >os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"])) >- EcpSourceDir =3D >os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"])) >- >- os.environ["EFI_SOURCE"] =3D EfiSourceDir >- os.environ["EDK_SOURCE"] =3D EdkSourceDir >- os.environ["ECP_SOURCE"] =3D EcpSourceDir >- > GlobalData.gWorkspace =3D WorkspaceDir >- GlobalData.gEfiSource =3D EfiSourceDir >- GlobalData.gEdkSource =3D EdkSourceDir >- GlobalData.gEcpSource =3D EcpSourceDir > > GlobalData.gGlobalDefines["WORKSPACE"] =3D WorkspaceDir >- GlobalData.gGlobalDefines["EFI_SOURCE"] =3D EfiSourceDir >- GlobalData.gGlobalDefines["EDK_SOURCE"] =3D EdkSourceDir >- GlobalData.gGlobalDefines["ECP_SOURCE"] =3D EcpSourceDir > > EdkLogger.info("Loading ECC configuration ... done") > # Generate checkpoints list > EccGlobalData.gConfig =3D Configuration(self.ConfigFile) > >diff --git >a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py >b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py >index 283789fd1d..862974894a 100644 >--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py >+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py >@@ -608,21 +608,10 @@ class InfParser(MetaFileParser): > for Index in range(0, len(self._ValueList)): > Value =3D self._ValueList[Index] > if not Value: > continue > >- if Value.upper().find('$(EFI_SOURCE)\Edk'.upper()) > -1 o= r >Value.upper().find('$(EFI_SOURCE)/Edk'.upper()) > -1: >- Value =3D '$(EDK_SOURCE)' + Value[17:] >- if Value.find('$(EFI_SOURCE)') > -1 or Value.find('$(EDK_= SOURCE)') > >-1: >- pass >- elif Value.startswith('.'): >- pass >- elif Value.startswith('$('): >- pass >- else: >- Value =3D '$(EFI_SOURCE)/' + Value >- > self._ValueList[Index] =3D ReplaceMacro(Value, Macros) > > ## Parse [Sources] section > # > # Only path can have macro used. So we need to replace them before = use. >@@ -1357,20 +1346,11 @@ class DscParser(MetaFileParser): > __IncludeMacros =3D {} > # > # Allow using system environment variables in path after !in= clude > # > __IncludeMacros['WORKSPACE'] =3D >GlobalData.gGlobalDefines['WORKSPACE'] >- if "ECP_SOURCE" in GlobalData.gGlobalDefines.keys(): >- __IncludeMacros['ECP_SOURCE'] =3D >GlobalData.gGlobalDefines['ECP_SOURCE'] >- # >- # During GenFds phase call DSC parser, will go into this bran= ch. >- # >- elif "ECP_SOURCE" in GlobalData.gCommandLineDefines.keys(): >- __IncludeMacros['ECP_SOURCE'] =3D >GlobalData.gCommandLineDefines['ECP_SOURCE'] > >- __IncludeMacros['EFI_SOURCE'] =3D >GlobalData.gGlobalDefines['EFI_SOURCE'] >- __IncludeMacros['EDK_SOURCE'] =3D >GlobalData.gGlobalDefines['EDK_SOURCE'] > # > # Allow using MACROs comes from [Defines] section to keep >compatible. > # > __IncludeMacros.update(self._Macros) > >-- >2.19.1.windows.1