diff options
| author | Feng, Bob C <bob.c.feng@intel.com> | 2019-01-14 09:24:12 +0800 |
|---|---|---|
| committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-01-14 09:34:23 +0800 |
| commit | 822925013278733ac7f03c35fece2df3e8bc3614 (patch) | |
| tree | cf8c02d659fc3bcebe6c3c0347e40863a6ecd331 /BaseTools/Source/Python/build/BuildReport.py | |
| parent | 514c55c18597c48e1648b67f85cf25b5984da5cc (diff) | |
| download | edk2-822925013278733ac7f03c35fece2df3e8bc3614.tar.gz edk2-822925013278733ac7f03c35fece2df3e8bc3614.tar.bz2 edk2-822925013278733ac7f03c35fece2df3e8bc3614.zip | |
BaseTools: Remove unused logic for EDKI
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove EDK module type support from BaseTools python code.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/build/BuildReport.py')
| -rw-r--r-- | BaseTools/Source/Python/build/BuildReport.py | 54 |
1 files changed, 19 insertions, 35 deletions
diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index 3f3c1a12f1..654a69e05c 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -332,10 +332,6 @@ class LibraryReport(object): #
def __init__(self, M):
self.LibraryList = []
- if int(str(M.AutoGenVersion), 0) >= 0x00010005:
- self._EdkIIModule = True
- else:
- self._EdkIIModule = False
for Lib in M.DependentLibraryList:
LibInfPath = str(Lib)
@@ -368,28 +364,23 @@ class LibraryReport(object): LibInfPath = LibraryItem[0]
FileWrite(File, LibInfPath)
- #
- # Report library class, library constructor and destructor for
- # EDKII style module.
- #
- if self._EdkIIModule:
- LibClass = LibraryItem[1]
- EdkIILibInfo = ""
- LibConstructor = " ".join(LibraryItem[2])
- if LibConstructor:
- EdkIILibInfo += " C = " + LibConstructor
- LibDestructor = " ".join(LibraryItem[3])
- if LibDestructor:
- EdkIILibInfo += " D = " + LibDestructor
- LibDepex = " ".join(LibraryItem[4])
- if LibDepex:
- EdkIILibInfo += " Depex = " + LibDepex
- if LibraryItem[5]:
- EdkIILibInfo += " Time = " + LibraryItem[5]
- if EdkIILibInfo:
- FileWrite(File, "{%s: %s}" % (LibClass, EdkIILibInfo))
- else:
- FileWrite(File, "{%s}" % LibClass)
+ LibClass = LibraryItem[1]
+ EdkIILibInfo = ""
+ LibConstructor = " ".join(LibraryItem[2])
+ if LibConstructor:
+ EdkIILibInfo += " C = " + LibConstructor
+ LibDestructor = " ".join(LibraryItem[3])
+ if LibDestructor:
+ EdkIILibInfo += " D = " + LibDestructor
+ LibDepex = " ".join(LibraryItem[4])
+ if LibDepex:
+ EdkIILibInfo += " Depex = " + LibDepex
+ if LibraryItem[5]:
+ EdkIILibInfo += " Time = " + LibraryItem[5]
+ if EdkIILibInfo:
+ FileWrite(File, "{%s: %s}" % (LibClass, EdkIILibInfo))
+ else:
+ FileWrite(File, "{%s}" % LibClass)
FileWrite(File, gSubSectionEnd)
@@ -1546,15 +1537,8 @@ class PredictionReport(object): if Module.Guid and not Module.IsLibrary:
EntryPoint = " ".join(Module.Module.ModuleEntryPointList)
- if int(str(Module.AutoGenVersion), 0) >= 0x00010005:
- RealEntryPoint = "_ModuleEntryPoint"
- else:
- RealEntryPoint = EntryPoint
- if EntryPoint == "_ModuleEntryPoint":
- CCFlags = Module.BuildOption.get("CC", {}).get("FLAGS", "")
- Match = gGlueLibEntryPoint.search(CCFlags)
- if Match:
- EntryPoint = Match.group(1)
+
+ RealEntryPoint = "_ModuleEntryPoint"
self._FfsEntryPoint[Module.Guid.upper()] = (EntryPoint, RealEntryPoint)
|