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.100; helo=mga07.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 570142194D3B8 for ; Wed, 16 Jan 2019 17:49:57 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 17:49:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="311084883" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga006.fm.intel.com with ESMTP; 16 Jan 2019 17:49:57 -0800 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 16 Jan 2019 17:49:56 -0800 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 16 Jan 2019 17:49:56 -0800 Received: from shsmsx152.ccr.corp.intel.com ([169.254.6.44]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.239]) with mapi id 14.03.0415.000; Thu, 17 Jan 2019 09:49:55 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch V2] BaseTools: Remove EDK_SOURCE keyword from GenFds tool. Thread-Index: AQHUrMlUeuN+eUnipk2E+W6rQk+klqWytE3w Date: Thu, 17 Jan 2019 01:49:54 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3B3778@SHSMSX152.ccr.corp.intel.com> References: <20190115115546.6204-1-bob.c.feng@intel.com> In-Reply-To: <20190115115546.6204-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 GenFds 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:49:58 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >Feng, Bob C >Sent: Tuesday, January 15, 2019 7:56 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [edk2] [Patch V2] BaseTools: Remove EDK_SOURCE keyword from >GenFds tool. > >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1350 >Remove unused EDK_SOURCE keyword from GenFds tool. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >Tested-by: Laszlo Ersek >--- > BaseTools/Source/Python/GenFds/GenFds.py | 3 --- > BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 --- > 2 files changed, 6 deletions(-) > >diff --git a/BaseTools/Source/Python/GenFds/GenFds.py >b/BaseTools/Source/Python/GenFds/GenFds.py >index 77383d3378..5a166bf455 100644 >--- a/BaseTools/Source/Python/GenFds/GenFds.py >+++ b/BaseTools/Source/Python/GenFds/GenFds.py >@@ -73,11 +73,10 @@ def resetFdsGlobalVariable(): > GenFdsGlobalVariable.FdfParser =3D None > GenFdsGlobalVariable.LibDir =3D '' > GenFdsGlobalVariable.WorkSpace =3D None > GenFdsGlobalVariable.WorkSpaceDir =3D '' > GenFdsGlobalVariable.ConfDir =3D '' >- GenFdsGlobalVariable.EdkSourceDir =3D '' > GenFdsGlobalVariable.OutputDirFromDscDict =3D {} > GenFdsGlobalVariable.TargetName =3D '' > GenFdsGlobalVariable.ToolChainTag =3D '' > GenFdsGlobalVariable.RuleDict =3D {} > GenFdsGlobalVariable.ArchList =3D None >@@ -141,12 +140,10 @@ def GenFdsApi(FdsCommandDict, >WorkSpaceDataBase=3DNone): > EdkLogger.error("GenFds", PARAMETER_INVALID, "WORKSPACE is >invalid", > ExtraData=3D"Please use '-w' switch to pass i= t or set the >WORKSPACE environment variable.") > else: > Workspace =3D >os.path.normcase(FdsCommandDict.get("Workspace",os.environ.get('WORK >SPACE'))) > GenFdsGlobalVariable.WorkSpaceDir =3D Workspace >- if 'EDK_SOURCE' in os.environ: >- GenFdsGlobalVariable.EdkSourceDir =3D >os.path.normcase(os.environ['EDK_SOURCE']) > if FdsCommandDict.get("debug"): > GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + >Workspace) > if FdsCommandDict.get("GenfdsMultiThread"): > GenFdsGlobalVariable.EnableGenfdsMultiThread =3D True > os.chdir(GenFdsGlobalVariable.WorkSpaceDir) >diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py >b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py >index 51c9ab046c..febe0737a2 100644 >--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py >+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py >@@ -48,11 +48,10 @@ class GenFdsGlobalVariable: > FdfParser =3D None > LibDir =3D '' > WorkSpace =3D None > WorkSpaceDir =3D '' > ConfDir =3D '' >- EdkSourceDir =3D '' > OutputDirFromDscDict =3D {} > TargetName =3D '' > ToolChainTag =3D '' > RuleDict =3D {} > ArchList =3D None >@@ -338,11 +337,10 @@ class GenFdsGlobalVariable: > GenFdsGlobalVariable.WorkSpace =3D WorkSpace.Db > GenFdsGlobalVariable.ArchList =3D ArchList > GenFdsGlobalVariable.ToolChainTag =3D >GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"] > GenFdsGlobalVariable.TargetName =3D >GlobalData.gGlobalDefines["TARGET"] > GenFdsGlobalVariable.ActivePlatform =3D GlobalData.gActivePlatfor= m >- GenFdsGlobalVariable.EdkSourceDir =3D >GlobalData.gGlobalDefines["EDK_SOURCE"] > GenFdsGlobalVariable.ConfDir =3D GlobalData.gConfDirectory > GenFdsGlobalVariable.EnableGenfdsMultiThread =3D >GlobalData.gEnableGenfdsMultiThread > for Arch in ArchList: > GenFdsGlobalVariable.OutputDirDict[Arch] =3D os.path.normpath= ( > os.path.join(GlobalData.gWorkspace, >@@ -755,11 +753,10 @@ class GenFdsGlobalVariable: > def MacroExtend (Str, MacroDict=3D{}, Arch=3DDataType.TAB_COMMON): > if Str is None: > return None > > Dict =3D {'$(WORKSPACE)': GenFdsGlobalVariable.WorkSpaceDir, >- '$(EDK_SOURCE)': GenFdsGlobalVariable.EdkSourceDir, > # '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFro= mDsc, > '$(TARGET)': GenFdsGlobalVariable.TargetName, > '$(TOOL_CHAIN_TAG)': GenFdsGlobalVariable.ToolChainTag, > '$(SPACE)': ' ' > } >-- >2.19.1.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel