Re: [edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword from ECC Tool

2019-01-16 Thread Gao, Liming 
Reviewed-by: Liming Gao 

>-Original Message-
>From: Feng, Bob C
>Sent: Tuesday, January 15, 2019 7:03 PM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C ; Gao, Liming 
>Subject: [Patch] BaseTools: Remove EDK_SOURCE keyword from ECC Tool
>
>BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
>Remove EDK_SOURCE keyword from ECC Tool.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Bob Feng 
>Cc: Liming Gao 
>---
> BaseTools/Source/Python/Ecc/EccMain.py| 27 ---
> .../Ecc/MetaFileWorkspace/MetaFileParser.py   | 20 --
> 2 files changed, 47 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Ecc/EccMain.py
>b/BaseTools/Source/Python/Ecc/EccMain.py
>index 5f9e497e37..0f97447751 100644
>--- a/BaseTools/Source/Python/Ecc/EccMain.py
>+++ b/BaseTools/Source/Python/Ecc/EccMain.py
>@@ -66,47 +66,20 @@ class Ecc(object):
>
> # Parse the options and args
> self.ParseOption()
> EdkLogger.info(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime())
>+ "[00:00]" + "\n")
>
>-#
>-# Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always
>point to ECP
>-#
> WorkspaceDir =
>os.path.normcase(os.path.normpath(os.environ["WORKSPACE"]))
> os.environ["WORKSPACE"] = WorkspaceDir
>
> # set multiple workspace
> PackagesPath = os.getenv("PACKAGES_PATH")
> mws.setWs(WorkspaceDir, PackagesPath)
>
>-if "ECP_SOURCE" not in os.environ:
>-os.environ["ECP_SOURCE"] = mws.join(WorkspaceDir,
>GlobalData.gEdkCompatibilityPkg)
>-if "EFI_SOURCE" not in os.environ:
>-os.environ["EFI_SOURCE"] = os.environ["ECP_SOURCE"]
>-if "EDK_SOURCE" not in os.environ:
>-os.environ["EDK_SOURCE"] = os.environ["ECP_SOURCE"]
>-
>-#
>-# Unify case of characters on case-insensitive systems
>-#
>-EfiSourceDir =
>os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"]))
>-EdkSourceDir =
>os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"]))
>-EcpSourceDir =
>os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"]))
>-
>-os.environ["EFI_SOURCE"] = EfiSourceDir
>-os.environ["EDK_SOURCE"] = EdkSourceDir
>-os.environ["ECP_SOURCE"] = EcpSourceDir
>-
> GlobalData.gWorkspace = WorkspaceDir
>-GlobalData.gEfiSource = EfiSourceDir
>-GlobalData.gEdkSource = EdkSourceDir
>-GlobalData.gEcpSource = EcpSourceDir
>
> GlobalData.gGlobalDefines["WORKSPACE"]  = WorkspaceDir
>-GlobalData.gGlobalDefines["EFI_SOURCE"] = EfiSourceDir
>-GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir
>-GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir
>
> EdkLogger.info("Loading ECC configuration ... done")
> # Generate checkpoints list
> EccGlobalData.gConfig = Configuration(self.ConfigFile)
>
>diff --git
>a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
>b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
>index 283789fd1d..862974894a 100644
>--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
>+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
>@@ -608,21 +608,10 @@ class InfParser(MetaFileParser):
> for Index in range(0, len(self._ValueList)):
> Value = self._ValueList[Index]
> if not Value:
> continue
>
>-if Value.upper().find('$(EFI_SOURCE)\Edk'.upper()) > -1 or
>Value.upper().find('$(EFI_SOURCE)/Edk'.upper()) > -1:
>-Value = '$(EDK_SOURCE)' + Value[17:]
>-if Value.find('$(EFI_SOURCE)') > -1 or 
>Value.find('$(EDK_SOURCE)') >
>-1:
>-pass
>-elif Value.startswith('.'):
>-pass
>-elif Value.startswith('$('):
>-pass
>-else:
>-Value = '$(EFI_SOURCE)/' + Value
>-
> self._ValueList[Index] = ReplaceMacro(Value, Macros)
>
> ## Parse [Sources] section
> #
> #   Only path can have macro used. So we need to replace them before use.
>@@ -1357,20 +1346,11 @@ class DscParser(MetaFileParser):
> __IncludeMacros = {}
> #
> # Allow using system environment variables  in path after !include
> #
> __IncludeMacros['WORKSPACE'] =
>GlobalData.gGlobalDefines['WORKSPACE']
>-if "ECP_SOURCE" in GlobalData.gGlobalDefines.keys():
>-__IncludeMacros['ECP_SOURCE'] =
>GlobalData.gGlobalDefines['ECP_SOURCE']
>-#
>-# During GenFds phase call DSC parser, will go into this branch.
>-#
>-elif "ECP_SOURCE" in GlobalData.gCommandLineDefines.keys():
>-__IncludeMacros['ECP_SOURCE'] =
>GlobalData.gCommandLineDefines['ECP_SOURCE']
>
>-

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

2019-01-15 Thread Laszlo Ersek 
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 
> Cc: Liming Gao 
> ---
>  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

20190114111341.20784-1-bob.c.feng@intel.com">http://mid.mail-archive.com/20190114111341.20784-1-bob.c.feng@intel.com

then you can add

Tested-by: Laszlo Ersek 

Thanks,
Laszlo
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword from Inf Parser.

2019-01-15 Thread Laszlo Ersek 
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 Inf Parser.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng 
> Cc: Liming Gao 
> ---
>  .../Source/Python/Workspace/InfBuildData.py   | 34 ---
>  1 file changed, 7 insertions(+), 27 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py 
> b/BaseTools/Source/Python/Workspace/InfBuildData.py
> index 02d6c1c756..709854de1e 100644
> --- a/BaseTools/Source/Python/Workspace/InfBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
> @@ -634,38 +634,18 @@ class InfBuildData(ModuleBuildClassObject):
>  
>  Macros = self._Macros
>  Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', 
> self._Arch)
>  RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, 
> self._Platform]
>  for Record in RecordList:
> -if Record[0].find('EDK_SOURCE') > -1:
> -File = NormPath(Record[0], self._Macros)
> -if File[0] == '.':
> -File = os.path.join(self._ModuleDir, File)
> -else:
> -File = os.path.join(GlobalData.gWorkspace, File)
> -File = RealPath(os.path.normpath(File))
> -if File:
> -RetVal.append(File)
> -
> -# TRICK: let compiler to choose correct header file
> -File = NormPath(Record[0], self._Macros)
> -if File[0] == '.':
> -File = os.path.join(self._ModuleDir, File)
> -else:
> -File = os.path.join(GlobalData.gWorkspace, File)
> -File = RealPath(os.path.normpath(File))
> -if File:
> -RetVal.append(File)
> +File = NormPath(Record[0], Macros)
> +if File[0] == '.':
> +File = os.path.join(self._ModuleDir, File)
>  else:
> -File = NormPath(Record[0], Macros)
> -if File[0] == '.':
> -File = os.path.join(self._ModuleDir, File)
> -else:
> -File = mws.join(GlobalData.gWorkspace, File)
> -File = RealPath(os.path.normpath(File))
> -if File:
> -RetVal.append(File)
> +File = mws.join(GlobalData.gWorkspace, File)
> +File = RealPath(os.path.normpath(File))
> +if File:
> +RetVal.append(File)
>  return RetVal
>  
>  ## Retrieve packages this module depends on
>  @cached_property
>  def Packages(self):
> 

again, if this patch has been identically extracted from

20190114111341.20784-1-bob.c.feng@intel.com">http://mid.mail-archive.com/20190114111341.20784-1-bob.c.feng@intel.com

then you can add

Tested-by: Laszlo Ersek 

Thanks,
Laszlo
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword from Inf Parser.

2019-01-15 Thread Feng, Bob C 
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove unused EDK_SOURCE keyword from Inf Parser.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng 
Cc: Liming Gao 
---
 .../Source/Python/Workspace/InfBuildData.py   | 34 ---
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py 
b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 02d6c1c756..709854de1e 100644
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -634,38 +634,18 @@ class InfBuildData(ModuleBuildClassObject):
 
 Macros = self._Macros
 Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', 
self._Arch)
 RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, 
self._Platform]
 for Record in RecordList:
-if Record[0].find('EDK_SOURCE') > -1:
-File = NormPath(Record[0], self._Macros)
-if File[0] == '.':
-File = os.path.join(self._ModuleDir, File)
-else:
-File = os.path.join(GlobalData.gWorkspace, File)
-File = RealPath(os.path.normpath(File))
-if File:
-RetVal.append(File)
-
-# TRICK: let compiler to choose correct header file
-File = NormPath(Record[0], self._Macros)
-if File[0] == '.':
-File = os.path.join(self._ModuleDir, File)
-else:
-File = os.path.join(GlobalData.gWorkspace, File)
-File = RealPath(os.path.normpath(File))
-if File:
-RetVal.append(File)
+File = NormPath(Record[0], Macros)
+if File[0] == '.':
+File = os.path.join(self._ModuleDir, File)
 else:
-File = NormPath(Record[0], Macros)
-if File[0] == '.':
-File = os.path.join(self._ModuleDir, File)
-else:
-File = mws.join(GlobalData.gWorkspace, File)
-File = RealPath(os.path.normpath(File))
-if File:
-RetVal.append(File)
+File = mws.join(GlobalData.gWorkspace, File)
+File = RealPath(os.path.normpath(File))
+if File:
+RetVal.append(File)
 return RetVal
 
 ## Retrieve packages this module depends on
 @cached_property
 def Packages(self):
-- 
2.19.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword from ECC Tool

2019-01-15 Thread Feng, Bob C 
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove EDK_SOURCE keyword from ECC Tool.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng 
Cc: Liming Gao 
---
 BaseTools/Source/Python/Ecc/EccMain.py| 27 ---
 .../Ecc/MetaFileWorkspace/MetaFileParser.py   | 20 --
 2 files changed, 47 deletions(-)

diff --git a/BaseTools/Source/Python/Ecc/EccMain.py 
b/BaseTools/Source/Python/Ecc/EccMain.py
index 5f9e497e37..0f97447751 100644
--- a/BaseTools/Source/Python/Ecc/EccMain.py
+++ b/BaseTools/Source/Python/Ecc/EccMain.py
@@ -66,47 +66,20 @@ class Ecc(object):
 
 # Parse the options and args
 self.ParseOption()
 EdkLogger.info(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime()) 
+ "[00:00]" + "\n")
 
-#
-# Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always 
point to ECP
-#
 WorkspaceDir = 
os.path.normcase(os.path.normpath(os.environ["WORKSPACE"]))
 os.environ["WORKSPACE"] = WorkspaceDir
 
 # set multiple workspace
 PackagesPath = os.getenv("PACKAGES_PATH")
 mws.setWs(WorkspaceDir, PackagesPath)
 
-if "ECP_SOURCE" not in os.environ:
-os.environ["ECP_SOURCE"] = mws.join(WorkspaceDir, 
GlobalData.gEdkCompatibilityPkg)
-if "EFI_SOURCE" not in os.environ:
-os.environ["EFI_SOURCE"] = os.environ["ECP_SOURCE"]
-if "EDK_SOURCE" not in os.environ:
-os.environ["EDK_SOURCE"] = os.environ["ECP_SOURCE"]
-
-#
-# Unify case of characters on case-insensitive systems
-#
-EfiSourceDir = 
os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"]))
-EdkSourceDir = 
os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"]))
-EcpSourceDir = 
os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"]))
-
-os.environ["EFI_SOURCE"] = EfiSourceDir
-os.environ["EDK_SOURCE"] = EdkSourceDir
-os.environ["ECP_SOURCE"] = EcpSourceDir
-
 GlobalData.gWorkspace = WorkspaceDir
-GlobalData.gEfiSource = EfiSourceDir
-GlobalData.gEdkSource = EdkSourceDir
-GlobalData.gEcpSource = EcpSourceDir
 
 GlobalData.gGlobalDefines["WORKSPACE"]  = WorkspaceDir
-GlobalData.gGlobalDefines["EFI_SOURCE"] = EfiSourceDir
-GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir
-GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir
 
 EdkLogger.info("Loading ECC configuration ... done")
 # Generate checkpoints list
 EccGlobalData.gConfig = Configuration(self.ConfigFile)
 
diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py 
b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 283789fd1d..862974894a 100644
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -608,21 +608,10 @@ class InfParser(MetaFileParser):
 for Index in range(0, len(self._ValueList)):
 Value = self._ValueList[Index]
 if not Value:
 continue
 
-if Value.upper().find('$(EFI_SOURCE)\Edk'.upper()) > -1 or 
Value.upper().find('$(EFI_SOURCE)/Edk'.upper()) > -1:
-Value = '$(EDK_SOURCE)' + Value[17:]
-if Value.find('$(EFI_SOURCE)') > -1 or 
Value.find('$(EDK_SOURCE)') > -1:
-pass
-elif Value.startswith('.'):
-pass
-elif Value.startswith('$('):
-pass
-else:
-Value = '$(EFI_SOURCE)/' + Value
-
 self._ValueList[Index] = ReplaceMacro(Value, Macros)
 
 ## Parse [Sources] section
 #
 #   Only path can have macro used. So we need to replace them before use.
@@ -1357,20 +1346,11 @@ class DscParser(MetaFileParser):
 __IncludeMacros = {}
 #
 # Allow using system environment variables  in path after !include
 #
 __IncludeMacros['WORKSPACE'] = 
GlobalData.gGlobalDefines['WORKSPACE']
-if "ECP_SOURCE" in GlobalData.gGlobalDefines.keys():
-__IncludeMacros['ECP_SOURCE'] = 
GlobalData.gGlobalDefines['ECP_SOURCE']
-#
-# During GenFds phase call DSC parser, will go into this branch.
-#
-elif "ECP_SOURCE" in GlobalData.gCommandLineDefines.keys():
-__IncludeMacros['ECP_SOURCE'] = 
GlobalData.gCommandLineDefines['ECP_SOURCE']
 
-__IncludeMacros['EFI_SOURCE'] = 
GlobalData.gGlobalDefines['EFI_SOURCE']
-__IncludeMacros['EDK_SOURCE'] = 
GlobalData.gGlobalDefines['EDK_SOURCE']
 #
 # Allow using MACROs comes from [Defines] section to keep 
compatible.
 #
 __IncludeMacros.update(self._Macros)
 
-- 
2.19.1.windows.1

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

2019-01-15 Thread Feng, Bob C 
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 
Cc: Liming Gao 
---
 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

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword

2019-01-14 Thread Laszlo Ersek 
On 01/14/19 15:03, Feng, Bob C wrote:
> Sure. Since ECC and UPT are two standalone tools, I'll send another patch for 
> them.

That sounds like a good idea to me, but shouldn't we then split this
patch as well?

Namely, the first two hunks apply to GenFds. So, for those, I would
suggest a common patch, and a subject like

  BaseTools/GenFds: remove EDK_SOURCE keyword

However, the last hunk applies to "Workspace/InfBuildData.py". What
utility does that file belong to? "build" perhaps? What would be the
correct subject for the patch?

I mean, if these three hunks belong together, that's OK (and then they
should be in a single patch), but the subject line, as-is, is too
generic. We should say something more specifc than just "BaseTools" --
we're not covering UPT or ECC, and those are also under BaseTools.

Other than that, the patch works for me:

Tested-by: Laszlo Ersek 

But please don't push it without updating the subject line at least.

Thanks
Laszlo

> -Original Message-
> From: Gao, Liming 
> Sent: Monday, January 14, 2019 9:57 PM
> To: Feng, Bob C ; edk2-devel@lists.01.org
> Cc: Laszlo Ersek 
> Subject: RE: [Patch] BaseTools: Remove EDK_SOURCE keyword
> 
> Bob:
>   This change cleans up EDK environments in GenFds. Could you continue to 
> clean up EDK env in ECC and UPT tool?
> 
> Thanks
> Liming
>> -Original Message-
>> From: Feng, Bob C
>> Sent: Monday, January 14, 2019 7:14 PM
>> To: edk2-devel@lists.01.org
>> Cc: Feng, Bob C ; Gao, Liming 
>> ; Laszlo Ersek 
>> Subject: [Patch] BaseTools: Remove EDK_SOURCE keyword
>>
>> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
>> Remove unused EDK_SOURCE keyword in python tool.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Bob Feng 
>> Cc: Liming Gao 
>> Cc: Laszlo Ersek 
>> ---
>>  BaseTools/Source/Python/GenFds/GenFds.py  |  3 --
>>  .../Python/GenFds/GenFdsGlobalVariable.py |  3 --
>>  .../Source/Python/Workspace/InfBuildData.py   | 34 ---
>>  3 files changed, 7 insertions(+), 33 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"]
>>

Re: [edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword

2019-01-14 Thread Feng, Bob C 
Sure. Since ECC and UPT are two standalone tools, I'll send another patch for 
them.

-Original Message-
From: Gao, Liming 
Sent: Monday, January 14, 2019 9:57 PM
To: Feng, Bob C ; edk2-devel@lists.01.org
Cc: Laszlo Ersek 
Subject: RE: [Patch] BaseTools: Remove EDK_SOURCE keyword

Bob:
  This change cleans up EDK environments in GenFds. Could you continue to clean 
up EDK env in ECC and UPT tool?

Thanks
Liming
> -Original Message-
> From: Feng, Bob C
> Sent: Monday, January 14, 2019 7:14 PM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C ; Gao, Liming 
> ; Laszlo Ersek 
> Subject: [Patch] BaseTools: Remove EDK_SOURCE keyword
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
> Remove unused EDK_SOURCE keyword in python tool.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng 
> Cc: Liming Gao 
> Cc: Laszlo Ersek 
> ---
>  BaseTools/Source/Python/GenFds/GenFds.py  |  3 --
>  .../Python/GenFds/GenFdsGlobalVariable.py |  3 --
>  .../Source/Python/Workspace/InfBuildData.py   | 34 ---
>  3 files changed, 7 insertions(+), 33 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)': ' '
> }
> diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py 
>

Re: [edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword

2019-01-14 Thread Gao, Liming 
Bob:
  This change cleans up EDK environments in GenFds. Could you continue to clean 
up EDK env in ECC and UPT tool?

Thanks
Liming
> -Original Message-
> From: Feng, Bob C
> Sent: Monday, January 14, 2019 7:14 PM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C ; Gao, Liming ; 
> Laszlo Ersek 
> Subject: [Patch] BaseTools: Remove EDK_SOURCE keyword
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
> Remove unused EDK_SOURCE keyword in python tool.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng 
> Cc: Liming Gao 
> Cc: Laszlo Ersek 
> ---
>  BaseTools/Source/Python/GenFds/GenFds.py  |  3 --
>  .../Python/GenFds/GenFdsGlobalVariable.py |  3 --
>  .../Source/Python/Workspace/InfBuildData.py   | 34 ---
>  3 files changed, 7 insertions(+), 33 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)': ' '
> }
> diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py 
> b/BaseTools/Source/Python/Workspace/InfBuildData.py
> index 02d6c1c756..709854de1e 100644
> --- a/BaseTools/Source/Python/Workspace/InfBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
> @@ -634,38 +634,18 @@ class InfBuildData(ModuleBuildClassObject):
> 
>  Macros = self._Macros
>

[edk2] [Patch] BaseTools: Remove EDK_SOURCE keyword

2019-01-14 Thread Feng, Bob C 
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove unused EDK_SOURCE keyword in python tool.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng 
Cc: Liming Gao 
Cc: Laszlo Ersek 
---
 BaseTools/Source/Python/GenFds/GenFds.py  |  3 --
 .../Python/GenFds/GenFdsGlobalVariable.py |  3 --
 .../Source/Python/Workspace/InfBuildData.py   | 34 ---
 3 files changed, 7 insertions(+), 33 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)': ' '
}
diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py 
b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 02d6c1c756..709854de1e 100644
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -634,38 +634,18 @@ class InfBuildData(ModuleBuildClassObject):
 
 Macros = self._Macros
 Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', 
self._Arch)
 RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, 
self._Platform]
 for Record in RecordList:
-if Record[0].find('EDK_SOURCE') > -1:
-File = NormPath(Record[0], self._Macros)
-if File[0] == '.':
-File = os.path.join(self._ModuleDir, File)
-else:
-File = os.path.join(GlobalData.gWorkspace, File)
-File = RealPath(os.path.normpath(File))
-