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

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

>-Original Message-
>From: Feng, Bob C
>Sent: Tuesday, January 15, 2019 7:57 PM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C ; Gao, Liming 
>Subject: [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser.
>
>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 
>Tested-by: Laszlo Ersek 
>---
> .../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 V2] 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 
Tested-by: Laszlo Ersek 
---
 .../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