self.CommonFileDependency = []\r
self.FileListMacros = {}\r
self.ListFileMacros = {}\r
- self.ObjTargetDict = {}\r
+ self.ObjTargetDict = OrderedDict()\r
self.FileCache = {}\r
self.LibraryBuildCommandList = []\r
self.LibraryFileList = []\r
ForceIncludedFile,\r
self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList\r
)\r
+\r
+ # Check if header files are listed in metafile\r
+ # Get a list of unique module header source files from MetaFile\r
+ headerFilesInMetaFileSet = set()\r
+ for aFile in self._AutoGenObject.SourceFileList:\r
+ aFileName = str(aFile)\r
+ if not aFileName.endswith('.h'):\r
+ continue\r
+ headerFilesInMetaFileSet.add(aFileName.lower())\r
+\r
+ # Get a list of unique module autogen files\r
+ localAutoGenFileSet = set()\r
+ for aFile in self._AutoGenObject.AutoGenFileList:\r
+ localAutoGenFileSet.add(str(aFile).lower())\r
+\r
+ # Get a list of unique module dependency header files\r
+ # Exclude autogen files and files not in the source directory\r
+ headerFileDependencySet = set()\r
+ localSourceDir = str(self._AutoGenObject.SourceDir).lower()\r
+ for Dependency in FileDependencyDict.values():\r
+ for aFile in Dependency:\r
+ aFileName = str(aFile).lower()\r
+ if not aFileName.endswith('.h'):\r
+ continue\r
+ if aFileName in localAutoGenFileSet:\r
+ continue\r
+ if localSourceDir not in aFileName:\r
+ continue\r
+ headerFileDependencySet.add(aFileName)\r
+\r
+ # Check if a module dependency header file is missing from the module's MetaFile\r
+ for aFile in headerFileDependencySet:\r
+ if aFile in headerFilesInMetaFileSet:\r
+ continue\r
+ EdkLogger.warn("build","Module MetaFile [Sources] is missing local header!",\r
+ ExtraData = "Local Header: " + aFile + " not found in " + self._AutoGenObject.MetaFile.Path\r
+ )\r
+\r
DepSet = None\r
for File,Dependency in FileDependencyDict.items():\r
if not Dependency:\r
DependencyDict[File] = list(NewDepSet)\r
\r
# Convert target description object to target string in makefile\r
+ if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and TAB_C_CODE_FILE in self._AutoGenObject.Targets:\r
+ for T in self._AutoGenObject.Targets[TAB_C_CODE_FILE]:\r
+ NewFile = self.PlaceMacro(str(T), self.Macros)\r
+ if not self.ObjTargetDict.get(T.Target.SubDir):\r
+ self.ObjTargetDict[T.Target.SubDir] = set()\r
+ self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
for Type in self._AutoGenObject.Targets:\r
for T in self._AutoGenObject.Targets[Type]:\r
# Generate related macros if needed\r
self.ListFileMacros[T.ListFileMacro] = []\r
if T.GenIncListFile and T.IncListFileMacro not in self.ListFileMacros:\r
self.ListFileMacros[T.IncListFileMacro] = []\r
- if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and Type == TAB_C_CODE_FILE:\r
- NewFile = self.PlaceMacro(str(T), self.Macros)\r
- if self.ObjTargetDict.get(T.Target.SubDir):\r
- self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
- else:\r
- self.ObjTargetDict[T.Target.SubDir] = set()\r
- self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
\r
Deps = []\r
CCodeDeps = []\r
CommandList = T.Commands[:]\r
for Item in CommandList[:]:\r
SingleCommandList = Item.split()\r
- if len(SingleCommandList) > 0 and '$(CC)' in SingleCommandList[0]:\r
+ if len(SingleCommandList) > 0 and self.CheckCCCmd(SingleCommandList):\r
for Temp in SingleCommandList:\r
if Temp.startswith('/Fo'):\r
CmdSign = '%s%s' % (Temp.rsplit(TAB_SLASH, 1)[0], TAB_SLASH)\r
T.Commands.pop(Index)\r
return T, CmdSumDict, CmdTargetDict, CmdCppDict\r
\r
+ def CheckCCCmd(self, CommandList):\r
+ for cmd in CommandList:\r
+ if '$(CC)' in cmd:\r
+ return True\r
+ return False\r
## For creating makefile targets for dependent libraries\r
def ProcessDependentLibrary(self):\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r