tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "BaseTools: Improve GetDependencyList function" 

This reverts commit bc9e4194cf.
This change causes the dependent header files are missing in Makefile.
It makes the incremental build not work. So, revert this change.

Cc: Bob Feng<bob.c.feng@Intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng<bob.c.feng@Intel.com>
This commit is contained in:
Liming Gao 2019-09-20 14:00:12 +08:00
parent f4c898f2b2
commit fcdedafd97
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
BaseTools/Source/Python/AutoGen/GenMake.py
View File

@ -1696,25 +1696,22 @@ def GetDependencyList(AutoGenObject, FileCache, File, ForceList, SearchPathList)
CurrentFileDependencyList = DepDb[F] CurrentFileDependencyList = DepDb[F]
else: else:
try: try:
with open(F.Path, 'rb') as Fd: Fd = open(F.Path, 'rb')
FileContent = Fd.read(1) FileContent = Fd.read()
Fd.seek(0) Fd.close()
if not FileContent:
continue
if FileContent[0] == 0xff or FileContent[0] == 0xfe:
FileContent2 = Fd.read()
FileContent2 = FileContent2.decode('utf-16')
IncludedFileList = gIncludePattern.findall(FileContent2)
else:
FileLines = Fd.readlines()
FileContent2 = [line for line in FileLines if str(line).lstrip("#\t ")[:8] == "include "]
simpleFileContent="".join(FileContent2)
IncludedFileList = gIncludePattern.findall(simpleFileContent)
except BaseException as X: except BaseException as X:
EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X)) EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))
if not FileContent: if len(FileContent) == 0:
continue continue
try:
if FileContent[0] == 0xff or FileContent[0] == 0xfe:
FileContent = FileContent.decode('utf-16')
else:
FileContent = FileContent.decode()
except:
# The file is not txt file. for example .mcb file
continue
IncludedFileList = gIncludePattern.findall(FileContent)
for Inc in IncludedFileList: for Inc in IncludedFileList:
Inc = Inc.strip() Inc = Inc.strip()