* [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser.
@ 2019-01-15 11:56 Feng, Bob C
2019-01-17 1:50 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Feng, Bob C @ 2019-01-15 11:56 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 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>
Tested-by: Laszlo Ersek <lersek@redhat.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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser.
2019-01-15 11:56 [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser Feng, Bob C
@ 2019-01-17 1:50 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2019-01-17 1:50 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel@lists.01.org
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: Feng, Bob C
>Sent: Tuesday, January 15, 2019 7:57 PM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
>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 <bob.c.feng@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>Tested-by: Laszlo Ersek <lersek@redhat.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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-17 1:50 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:56 [Patch V2] BaseTools: Remove EDK_SOURCE keyword from Inf Parser Feng, Bob C
2019-01-17 1:50 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox