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

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

[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 <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 .../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

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

[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 <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  .../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

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