]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Remove EDK_SOURCE keyword from Inf Parser.
authorFeng, Bob C <bob.c.feng@intel.com>
Tue, 15 Jan 2019 10:14:04 +0000 (18:14 +0800)
committerFeng, Bob C <bob.c.feng@intel.com>
Thu, 17 Jan 2019 11:49:20 +0000 (19:49 +0800)
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>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/Python/Workspace/InfBuildData.py

index 02d6c1c7563bb182157864405f4c2142def7793d..709854de1ed52af3aae47ebcb2e8c4db6781afc5 100644 (file)
@@ -636,34 +636,14 @@ class InfBuildData(ModuleBuildClassObject):
         Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', self._Arch)\r
         RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, self._Platform]\r
         for Record in RecordList:\r
-            if Record[0].find('EDK_SOURCE') > -1:\r
-                File = NormPath(Record[0], self._Macros)\r
-                if File[0] == '.':\r
-                    File = os.path.join(self._ModuleDir, File)\r
-                else:\r
-                    File = os.path.join(GlobalData.gWorkspace, File)\r
-                File = RealPath(os.path.normpath(File))\r
-                if File:\r
-                    RetVal.append(File)\r
-\r
-                # TRICK: let compiler to choose correct header file\r
-                File = NormPath(Record[0], self._Macros)\r
-                if File[0] == '.':\r
-                    File = os.path.join(self._ModuleDir, File)\r
-                else:\r
-                    File = os.path.join(GlobalData.gWorkspace, File)\r
-                File = RealPath(os.path.normpath(File))\r
-                if File:\r
-                    RetVal.append(File)\r
+            File = NormPath(Record[0], Macros)\r
+            if File[0] == '.':\r
+                File = os.path.join(self._ModuleDir, File)\r
             else:\r
-                File = NormPath(Record[0], Macros)\r
-                if File[0] == '.':\r
-                    File = os.path.join(self._ModuleDir, File)\r
-                else:\r
-                    File = mws.join(GlobalData.gWorkspace, File)\r
-                File = RealPath(os.path.normpath(File))\r
-                if File:\r
-                    RetVal.append(File)\r
+                File = mws.join(GlobalData.gWorkspace, File)\r
+            File = RealPath(os.path.normpath(File))\r
+            if File:\r
+                RetVal.append(File)\r
         return RetVal\r
 \r
     ## Retrieve packages this module depends on\r