public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Feng, Bob C" <bob.c.feng@intel.com>
To: edk2-devel@lists.01.org
Cc: Bob Feng <bob.c.feng@intel.com>, Liming Gao <liming.gao@intel.com>
Subject: [Patch] BaseTools: Remove EDK_SOURCE keyword from Inf Parser.
Date: Tue, 15 Jan 2019 19:03:13 +0800	[thread overview]
Message-ID: <20190115110313.24660-1-bob.c.feng@intel.com> (raw)

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



             reply	other threads:[~2019-01-15 11:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-15 11:03 Feng, Bob C [this message]
2019-01-15 11:45 ` [Patch] BaseTools: Remove EDK_SOURCE keyword from Inf Parser Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190115110313.24660-1-bob.c.feng@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox