self.CommonFileDependency = []\r
self.FileListMacros = {}\r
self.ListFileMacros = {}\r
-\r
+ self.ObjTargetDict = OrderedDict()\r
self.FileCache = {}\r
self.LibraryBuildCommandList = []\r
self.LibraryFileList = []\r
# Remove duplicated include path, if any\r
if Attr == "FLAGS":\r
Value = RemoveDupOption(Value, IncPrefix, MyAgo.IncludePathList)\r
+ if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and Tool == 'CC' and '/GM' in Value:\r
+ Value = Value.replace(' /MP', '')\r
+ MyAgo.BuildOption[Tool][Attr] = Value\r
if Tool == "OPTROM" and PCI_COMPRESS_Flag:\r
ValueList = Value.split()\r
if ValueList:\r
False\r
)\r
\r
+ # Generate objlist used to create .obj file\r
+ for Type in self.ObjTargetDict:\r
+ NewLine = ' '.join(list(self.ObjTargetDict[Type]))\r
+ FileMacroList.append("OBJLIST_%s = %s" % (list(self.ObjTargetDict.keys()).index(Type), NewLine))\r
+\r
BcTargetList = []\r
\r
MakefileName = self._FILE_NAME_[self._FileType]\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
for File in DepSet:\r
self.CommonFileDependency.append(self.PlaceMacro(File.Path, self.Macros))\r
\r
+ CmdSumDict = {}\r
+ CmdTargetDict = {}\r
+ CmdCppDict = {}\r
+ DependencyDict = FileDependencyDict.copy()\r
for File in FileDependencyDict:\r
# skip non-C files\r
if File.Ext not in [".c", ".C"] or File.Name == "AutoGen.c":\r
NewDepSet = set(FileDependencyDict[File])\r
NewDepSet -= DepSet\r
FileDependencyDict[File] = ["$(COMMON_DEPS)"] + list(NewDepSet)\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.IncListFileMacro] = []\r
\r
Deps = []\r
+ CCodeDeps = []\r
# Add force-dependencies\r
for Dep in T.Dependencies:\r
Deps.append(self.PlaceMacro(str(Dep), self.Macros))\r
+ if Dep != '$(MAKE_FILE)':\r
+ CCodeDeps.append(self.PlaceMacro(str(Dep), self.Macros))\r
# Add inclusion-dependencies\r
if len(T.Inputs) == 1 and T.Inputs[0] in FileDependencyDict:\r
for F in FileDependencyDict[T.Inputs[0]]:\r
if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]:\r
Deps.append("$(%s)" % T.ListFileMacro)\r
\r
- TargetDict = {\r
- "target" : self.PlaceMacro(T.Target.Path, self.Macros),\r
- "cmd" : "\n\t".join(T.Commands),\r
- "deps" : Deps\r
- }\r
- self.BuildTargetList.append(self._BUILD_TARGET_TEMPLATE.Replace(TargetDict))\r
-\r
+ if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and Type == TAB_C_CODE_FILE:\r
+ T, CmdTarget, CmdTargetDict, CmdCppDict = self.ParserCCodeFile(T, Type, CmdSumDict, CmdTargetDict, CmdCppDict, DependencyDict)\r
+ TargetDict = {"target": self.PlaceMacro(T.Target.Path, self.Macros), "cmd": "\n\t".join(T.Commands),"deps": CCodeDeps}\r
+ CmdLine = self._BUILD_TARGET_TEMPLATE.Replace(TargetDict).rstrip().replace('\t$(OBJLIST', '$(OBJLIST')\r
+ if T.Commands:\r
+ CmdLine = '%s%s' %(CmdLine, TAB_LINE_BREAK)\r
+ if CCodeDeps or CmdLine:\r
+ self.BuildTargetList.append(CmdLine)\r
+ else:\r
+ TargetDict = {"target": self.PlaceMacro(T.Target.Path, self.Macros), "cmd": "\n\t".join(T.Commands),"deps": Deps}\r
+ self.BuildTargetList.append(self._BUILD_TARGET_TEMPLATE.Replace(TargetDict))\r
+\r
+ def ParserCCodeFile(self, T, Type, CmdSumDict, CmdTargetDict, CmdCppDict, DependencyDict):\r
+ if not CmdSumDict:\r
+ for item in self._AutoGenObject.Targets[Type]:\r
+ CmdSumDict[item.Target.SubDir] = item.Target.BaseName\r
+ for CppPath in item.Inputs:\r
+ Path = self.PlaceMacro(CppPath.Path, self.Macros)\r
+ if CmdCppDict.get(item.Target.SubDir):\r
+ CmdCppDict[item.Target.SubDir].append(Path)\r
+ else:\r
+ CmdCppDict[item.Target.SubDir] = ['$(MAKE_FILE)', Path]\r
+ if CppPath.Path in DependencyDict:\r
+ for Temp in DependencyDict[CppPath.Path]:\r
+ try:\r
+ Path = self.PlaceMacro(Temp.Path, self.Macros)\r
+ except:\r
+ continue\r
+ if Path not in (self.CommonFileDependency + CmdCppDict[item.Target.SubDir]):\r
+ CmdCppDict[item.Target.SubDir].append(Path)\r
+ if T.Commands:\r
+ CommandList = T.Commands[:]\r
+ for Item in CommandList[:]:\r
+ SingleCommandList = Item.split()\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
+ break\r
+ else: continue\r
+ if CmdSign not in list(CmdTargetDict.keys()):\r
+ CmdTargetDict[CmdSign] = Item.replace(Temp, CmdSign)\r
+ else:\r
+ CmdTargetDict[CmdSign] = "%s %s" % (CmdTargetDict[CmdSign], SingleCommandList[-1])\r
+ Index = CommandList.index(Item)\r
+ CommandList.pop(Index)\r
+ if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLASH, CmdSumDict[CmdSign.lstrip('/Fo').rsplit(TAB_SLASH, 1)[0]])):\r
+ Cpplist = CmdCppDict[T.Target.SubDir]\r
+ Cpplist.insert(0, '$(OBJLIST_%d): $(COMMON_DEPS)' % list(self.ObjTargetDict.keys()).index(T.Target.SubDir))\r
+ T.Commands[Index] = '%s\n\t%s' % (' \\\n\t'.join(Cpplist), CmdTargetDict[CmdSign])\r
+ else:\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
- if not LibraryAutoGen.IsBinaryModule:\r
+ if not LibraryAutoGen.IsBinaryModule and not LibraryAutoGen.CanSkipbyHash():\r
self.LibraryBuildDirectoryList.append(self.PlaceMacro(LibraryAutoGen.BuildDir, self.Macros))\r
\r
## Return a list containing source file's dependencies\r
def GetLibraryBuildDirectoryList(self):\r
DirList = []\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- if not LibraryAutoGen.IsBinaryModule:\r
+ if not LibraryAutoGen.IsBinaryModule and not LibraryAutoGen.CanSkipbyHash():\r
DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
def GetLibraryBuildDirectoryList(self):\r
DirList = []\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- if not LibraryAutoGen.IsBinaryModule:\r
+ if not LibraryAutoGen.IsBinaryModule and not LibraryAutoGen.CanSkipbyHash():\r
DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
projects / mirror_edk2.git / blobdiff