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>

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 77383d337810abe05aaf5725292adb0e227829c9..5a166bf45561cb0c46275b48616c4ebe6c340747 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -75,7 +75,6 @@ def resetFdsGlobalVariable():
     GenFdsGlobalVariable.WorkSpace = None\r
     GenFdsGlobalVariable.WorkSpaceDir = ''\r
     GenFdsGlobalVariable.ConfDir = ''\r
-    GenFdsGlobalVariable.EdkSourceDir = ''\r
     GenFdsGlobalVariable.OutputDirFromDscDict = {}\r
     GenFdsGlobalVariable.TargetName = ''\r
     GenFdsGlobalVariable.ToolChainTag = ''\r
@@ -143,8 +142,6 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
         else:\r
             Workspace = os.path.normcase(FdsCommandDict.get("Workspace",os.environ.get('WORKSPACE')))\r
             GenFdsGlobalVariable.WorkSpaceDir = Workspace\r
-            if 'EDK_SOURCE' in os.environ:\r
-                GenFdsGlobalVariable.EdkSourceDir = os.path.normcase(os.environ['EDK_SOURCE'])\r
             if FdsCommandDict.get("debug"):\r
                 GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace)\r
             if FdsCommandDict.get("GenfdsMultiThread"):\r

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 51c9ab046c7981de844cd173215ef615f8744e39..febe0737a2cc3ca7a7d7e5136e70c59db1919e09 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -50,7 +50,6 @@ class GenFdsGlobalVariable:
     WorkSpace = None\r
     WorkSpaceDir = ''\r
     ConfDir = ''\r
-    EdkSourceDir = ''\r
     OutputDirFromDscDict = {}\r
     TargetName = ''\r
     ToolChainTag = ''\r
@@ -340,7 +339,6 @@ class GenFdsGlobalVariable:
         GenFdsGlobalVariable.ToolChainTag = GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"]\r
         GenFdsGlobalVariable.TargetName = GlobalData.gGlobalDefines["TARGET"]\r
         GenFdsGlobalVariable.ActivePlatform = GlobalData.gActivePlatform\r
-        GenFdsGlobalVariable.EdkSourceDir = GlobalData.gGlobalDefines["EDK_SOURCE"]\r
         GenFdsGlobalVariable.ConfDir  = GlobalData.gConfDirectory\r
         GenFdsGlobalVariable.EnableGenfdsMultiThread = GlobalData.gEnableGenfdsMultiThread\r
         for Arch in ArchList:\r
@@ -757,7 +755,6 @@ class GenFdsGlobalVariable:
             return None\r
 \r
         Dict = {'$(WORKSPACE)': GenFdsGlobalVariable.WorkSpaceDir,\r
-                '$(EDK_SOURCE)': GenFdsGlobalVariable.EdkSourceDir,\r
 #                '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc,\r
                 '$(TARGET)': GenFdsGlobalVariable.TargetName,\r
                 '$(TOOL_CHAIN_TAG)': GenFdsGlobalVariable.ToolChainTag,\r