From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 62DAE211B736F for ; Tue, 15 Jan 2019 03:44:46 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1478A80470; Tue, 15 Jan 2019 11:44:46 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-50.rdu2.redhat.com [10.10.120.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id EAF59608E7; Tue, 15 Jan 2019 11:44:44 +0000 (UTC) To: "Feng, Bob C" , edk2-devel@lists.01.org Cc: Liming Gao References: <20190115110302.26224-1-bob.c.feng@intel.com> From: Laszlo Ersek Message-ID: Date: Tue, 15 Jan 2019 12:44:43 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190115110302.26224-1-bob.c.feng@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 15 Jan 2019 11:44:46 +0000 (UTC) Subject: Re: [Patch] 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: Tue, 15 Jan 2019 11:44:47 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Bob, On 01/15/19 12:03, Feng, Bob C wrote: > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350 > Remove unused EDK_SOURCE keyword from GenFds tool. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > 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 = None > GenFdsGlobalVariable.LibDir = '' > GenFdsGlobalVariable.WorkSpace = None > GenFdsGlobalVariable.WorkSpaceDir = '' > GenFdsGlobalVariable.ConfDir = '' > - GenFdsGlobalVariable.EdkSourceDir = '' > GenFdsGlobalVariable.OutputDirFromDscDict = {} > GenFdsGlobalVariable.TargetName = '' > GenFdsGlobalVariable.ToolChainTag = '' > GenFdsGlobalVariable.RuleDict = {} > GenFdsGlobalVariable.ArchList = None > @@ -141,12 +140,10 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None): > EdkLogger.error("GenFds", PARAMETER_INVALID, "WORKSPACE is invalid", > ExtraData="Please use '-w' switch to pass it or set the WORKSPACE environment variable.") > else: > Workspace = os.path.normcase(FdsCommandDict.get("Workspace",os.environ.get('WORKSPACE'))) > GenFdsGlobalVariable.WorkSpaceDir = Workspace > - if 'EDK_SOURCE' in os.environ: > - GenFdsGlobalVariable.EdkSourceDir = os.path.normcase(os.environ['EDK_SOURCE']) > if FdsCommandDict.get("debug"): > GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace) > if FdsCommandDict.get("GenfdsMultiThread"): > GenFdsGlobalVariable.EnableGenfdsMultiThread = 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 = None > LibDir = '' > WorkSpace = None > WorkSpaceDir = '' > ConfDir = '' > - EdkSourceDir = '' > OutputDirFromDscDict = {} > TargetName = '' > ToolChainTag = '' > RuleDict = {} > ArchList = None > @@ -338,11 +337,10 @@ class GenFdsGlobalVariable: > GenFdsGlobalVariable.WorkSpace = WorkSpace.Db > GenFdsGlobalVariable.ArchList = ArchList > GenFdsGlobalVariable.ToolChainTag = GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"] > GenFdsGlobalVariable.TargetName = GlobalData.gGlobalDefines["TARGET"] > GenFdsGlobalVariable.ActivePlatform = GlobalData.gActivePlatform > - GenFdsGlobalVariable.EdkSourceDir = GlobalData.gGlobalDefines["EDK_SOURCE"] > GenFdsGlobalVariable.ConfDir = GlobalData.gConfDirectory > GenFdsGlobalVariable.EnableGenfdsMultiThread = GlobalData.gEnableGenfdsMultiThread > for Arch in ArchList: > GenFdsGlobalVariable.OutputDirDict[Arch] = os.path.normpath( > os.path.join(GlobalData.gWorkspace, > @@ -755,11 +753,10 @@ class GenFdsGlobalVariable: > def MacroExtend (Str, MacroDict={}, Arch=DataType.TAB_COMMON): > if Str is None: > return None > > Dict = {'$(WORKSPACE)': GenFdsGlobalVariable.WorkSpaceDir, > - '$(EDK_SOURCE)': GenFdsGlobalVariable.EdkSourceDir, > # '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc, > '$(TARGET)': GenFdsGlobalVariable.TargetName, > '$(TOOL_CHAIN_TAG)': GenFdsGlobalVariable.ToolChainTag, > '$(SPACE)': ' ' > } > if this patch has been identically extracted from http://mid.mail-archive.com/20190114111341.20784-1-bob.c.feng@intel.com then you can add Tested-by: Laszlo Ersek Thanks, Laszlo