From 7f98ef37f6d1ec38366fcc32c2db42eaf7bb2cd2 Mon Sep 17 00:00:00 2001
From: "Feng, Bob C" <bob.c.feng@intel.com>
Date: Tue, 15 Jan 2019 18:12:32 +0800
Subject: [PATCH] BaseTools: Remove EDK_SOURCE keyword from GenFds tool.

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 <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---
 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
@@ -75,7 +75,6 @@ def resetFdsGlobalVariable():
     GenFdsGlobalVariable.WorkSpace = None
     GenFdsGlobalVariable.WorkSpaceDir = ''
     GenFdsGlobalVariable.ConfDir = ''
-    GenFdsGlobalVariable.EdkSourceDir = ''
     GenFdsGlobalVariable.OutputDirFromDscDict = {}
     GenFdsGlobalVariable.TargetName = ''
     GenFdsGlobalVariable.ToolChainTag = ''
@@ -143,8 +142,6 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
         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"):
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
@@ -50,7 +50,6 @@ class GenFdsGlobalVariable:
     WorkSpace = None
     WorkSpaceDir = ''
     ConfDir = ''
-    EdkSourceDir = ''
     OutputDirFromDscDict = {}
     TargetName = ''
     ToolChainTag = ''
@@ -340,7 +339,6 @@ class GenFdsGlobalVariable:
         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:
@@ -757,7 +755,6 @@ class GenFdsGlobalVariable:
             return None
 
         Dict = {'$(WORKSPACE)': GenFdsGlobalVariable.WorkSpaceDir,
-                '$(EDK_SOURCE)': GenFdsGlobalVariable.EdkSourceDir,
 #                '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc,
                 '$(TARGET)': GenFdsGlobalVariable.TargetName,
                 '$(TOOL_CHAIN_TAG)': GenFdsGlobalVariable.ToolChainTag,