* [Patch] BaseTools: Remove EDK_SOURCE keyword from GenFds tool.
@ 2019-01-15 11:03 Feng, Bob C
2019-01-15 11:44 ` Laszlo Ersek
0 siblings, 1 reply; 2+ messages in thread
From: Feng, Bob C @ 2019-01-15 11:03 UTC (permalink / raw)
To: edk2-devel; +Cc: Bob Feng, Liming Gao
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>
---
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)': ' '
}
--
2.19.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: Remove EDK_SOURCE keyword from GenFds tool.
2019-01-15 11:03 [Patch] BaseTools: Remove EDK_SOURCE keyword from GenFds tool Feng, Bob C
@ 2019-01-15 11:44 ` Laszlo Ersek
0 siblings, 0 replies; 2+ messages in thread
From: Laszlo Ersek @ 2019-01-15 11:44 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel; +Cc: Liming Gao
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 <bob.c.feng@intel.com>
> Cc: 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
> @@ -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 <lersek@redhat.com>
Thanks,
Laszlo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-15 11:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-15 11:03 [Patch] BaseTools: Remove EDK_SOURCE keyword from GenFds tool Feng, Bob C
2019-01-15 11:44 ` Laszlo Ersek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox