Re: [Patch V2] BaseTools: Remove EDK_SOURCE keyword from GenFds tool.

["Gao, Liming" <liming.gao@intel.com>]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----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 <liming.gao@intel.com>
>Subject: [edk2] [Patch V2] 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>
>---
> 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('WORK
>SPACE')))
>             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)': ' '
>                }
>--
>2.19.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel