sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Remove EDK_SOURCE keyword from GenFds tool.

Browse Source 
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>
This commit is contained in:
Feng, Bob C
2019-01-15 18:12:32 +08:00
parent 0006d3fd0f
commit 7f98ef37f6
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BaseTools/Source/Python/GenFds/GenFds.py
View File

@ -75,7 +75,6 @@ def resetFdsGlobalVariable():
GenFdsGlobalVariable.WorkSpace = None GenFdsGlobalVariable.WorkSpace = None
GenFdsGlobalVariable.WorkSpaceDir = '' GenFdsGlobalVariable.WorkSpaceDir = ''
GenFdsGlobalVariable.ConfDir = '' GenFdsGlobalVariable.ConfDir = ''
GenFdsGlobalVariable.EdkSourceDir = ''
GenFdsGlobalVariable.OutputDirFromDscDict = {} GenFdsGlobalVariable.OutputDirFromDscDict = {}
GenFdsGlobalVariable.TargetName = '' GenFdsGlobalVariable.TargetName = ''
GenFdsGlobalVariable.ToolChainTag = '' GenFdsGlobalVariable.ToolChainTag = ''
@ -143,8 +142,6 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
else: else:
Workspace = os.path.normcase(FdsCommandDict.get("Workspace",os.environ.get('WORKSPACE'))) Workspace = os.path.normcase(FdsCommandDict.get("Workspace",os.environ.get('WORKSPACE')))
GenFdsGlobalVariable.WorkSpaceDir = Workspace GenFdsGlobalVariable.WorkSpaceDir = Workspace
if 'EDK_SOURCE' in os.environ:
GenFdsGlobalVariable.EdkSourceDir = os.path.normcase(os.environ['EDK_SOURCE'])
if FdsCommandDict.get("debug"): if FdsCommandDict.get("debug"):
GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace) GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace)
if FdsCommandDict.get("GenfdsMultiThread"): if FdsCommandDict.get("GenfdsMultiThread"):

3
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
View File

@ -50,7 +50,6 @@ class GenFdsGlobalVariable:
WorkSpace = None WorkSpace = None
WorkSpaceDir = '' WorkSpaceDir = ''
ConfDir = '' ConfDir = ''
EdkSourceDir = ''
OutputDirFromDscDict = {} OutputDirFromDscDict = {}
TargetName = '' TargetName = ''
ToolChainTag = '' ToolChainTag = ''
@ -340,7 +339,6 @@ class GenFdsGlobalVariable:
GenFdsGlobalVariable.ToolChainTag = GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"] GenFdsGlobalVariable.ToolChainTag = GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"]
GenFdsGlobalVariable.TargetName = GlobalData.gGlobalDefines["TARGET"] GenFdsGlobalVariable.TargetName = GlobalData.gGlobalDefines["TARGET"]
GenFdsGlobalVariable.ActivePlatform = GlobalData.gActivePlatform GenFdsGlobalVariable.ActivePlatform = GlobalData.gActivePlatform
GenFdsGlobalVariable.EdkSourceDir = GlobalData.gGlobalDefines["EDK_SOURCE"]
GenFdsGlobalVariable.ConfDir = GlobalData.gConfDirectory GenFdsGlobalVariable.ConfDir = GlobalData.gConfDirectory
GenFdsGlobalVariable.EnableGenfdsMultiThread = GlobalData.gEnableGenfdsMultiThread GenFdsGlobalVariable.EnableGenfdsMultiThread = GlobalData.gEnableGenfdsMultiThread
for Arch in ArchList: for Arch in ArchList:
@ -757,7 +755,6 @@ class GenFdsGlobalVariable:
return None return None
Dict = {'$(WORKSPACE)': GenFdsGlobalVariable.WorkSpaceDir, Dict = {'$(WORKSPACE)': GenFdsGlobalVariable.WorkSpaceDir,
'$(EDK_SOURCE)': GenFdsGlobalVariable.EdkSourceDir,
# '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc, # '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc,
'$(TARGET)': GenFdsGlobalVariable.TargetName, '$(TARGET)': GenFdsGlobalVariable.TargetName,
'$(TOOL_CHAIN_TAG)': GenFdsGlobalVariable.ToolChainTag, '$(TOOL_CHAIN_TAG)': GenFdsGlobalVariable.ToolChainTag,