## @file\r
# Create makefile for MS nmake and GNU make\r
#\r
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2020, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2020, ARM Limited. All rights reserved.<BR>\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
\r
"EFI_PPI_DEPENDENCY" : gPpiDefinition,\r
}\r
\r
-## default makefile type\r
-gMakeType = ""\r
-if sys.platform == "win32":\r
- gMakeType = "nmake"\r
-else:\r
- gMakeType = "gmake"\r
-\r
+NMAKE_FILETYPE = "nmake"\r
+GMAKE_FILETYPE = "gmake"\r
+WIN32_PLATFORM = "win32"\r
+POSIX_PLATFORM = "posix"\r
\r
## BuildFile class\r
#\r
\r
## default file name for each type of build file\r
_FILE_NAME_ = {\r
- "nmake" : "Makefile",\r
- "gmake" : "GNUmakefile"\r
+ NMAKE_FILETYPE : "Makefile",\r
+ GMAKE_FILETYPE : "GNUmakefile"\r
}\r
\r
+ # Get Makefile name.\r
+ def getMakefileName(self):\r
+ if not self._FileType:\r
+ return self._DEFAULT_FILE_NAME_\r
+ else:\r
+ return self._FILE_NAME_[self._FileType]\r
+\r
## Fixed header string for makefile\r
_MAKEFILE_HEADER = '''#\r
# DO NOT EDIT\r
\r
## Header string for each type of build file\r
_FILE_HEADER_ = {\r
- "nmake" : _MAKEFILE_HEADER % _FILE_NAME_["nmake"],\r
- "gmake" : _MAKEFILE_HEADER % _FILE_NAME_["gmake"]\r
+ NMAKE_FILETYPE : _MAKEFILE_HEADER % _FILE_NAME_[NMAKE_FILETYPE],\r
+ GMAKE_FILETYPE : _MAKEFILE_HEADER % _FILE_NAME_[GMAKE_FILETYPE]\r
}\r
\r
## shell commands which can be used in build file in the form of macro\r
# $(RD) remove dir command\r
#\r
_SHELL_CMD_ = {\r
- "nmake" : {\r
+ WIN32_PLATFORM : {\r
"CP" : "copy /y",\r
"MV" : "move /y",\r
"RM" : "del /f /q",\r
"RD" : "rmdir /s /q",\r
},\r
\r
- "gmake" : {\r
+ POSIX_PLATFORM : {\r
"CP" : "cp -f",\r
"MV" : "mv -f",\r
"RM" : "rm -f",\r
\r
## directory separator\r
_SEP_ = {\r
- "nmake" : "\\",\r
- "gmake" : "/"\r
+ WIN32_PLATFORM : "\\",\r
+ POSIX_PLATFORM : "/"\r
}\r
\r
## directory creation template\r
_MD_TEMPLATE_ = {\r
- "nmake" : 'if not exist %(dir)s $(MD) %(dir)s',\r
- "gmake" : "$(MD) %(dir)s"\r
+ WIN32_PLATFORM : 'if not exist %(dir)s $(MD) %(dir)s',\r
+ POSIX_PLATFORM : "$(MD) %(dir)s"\r
}\r
\r
## directory removal template\r
_RD_TEMPLATE_ = {\r
- "nmake" : 'if exist %(dir)s $(RD) %(dir)s',\r
- "gmake" : "$(RD) %(dir)s"\r
+ WIN32_PLATFORM : 'if exist %(dir)s $(RD) %(dir)s',\r
+ POSIX_PLATFORM : "$(RD) %(dir)s"\r
}\r
## cp if exist\r
_CP_TEMPLATE_ = {\r
- "nmake" : 'if exist %(Src)s $(CP) %(Src)s %(Dst)s',\r
- "gmake" : "test -f %(Src)s && $(CP) %(Src)s %(Dst)s"\r
+ WIN32_PLATFORM : 'if exist %(Src)s $(CP) %(Src)s %(Dst)s',\r
+ POSIX_PLATFORM : "test -f %(Src)s && $(CP) %(Src)s %(Dst)s"\r
}\r
\r
_CD_TEMPLATE_ = {\r
- "nmake" : 'if exist %(dir)s cd %(dir)s',\r
- "gmake" : "test -e %(dir)s && cd %(dir)s"\r
+ WIN32_PLATFORM : 'if exist %(dir)s cd %(dir)s',\r
+ POSIX_PLATFORM : "test -e %(dir)s && cd %(dir)s"\r
}\r
\r
_MAKE_TEMPLATE_ = {\r
- "nmake" : 'if exist %(file)s "$(MAKE)" $(MAKE_FLAGS) -f %(file)s',\r
- "gmake" : 'test -e %(file)s && "$(MAKE)" $(MAKE_FLAGS) -f %(file)s'\r
+ WIN32_PLATFORM : 'if exist %(file)s "$(MAKE)" $(MAKE_FLAGS) -f %(file)s',\r
+ POSIX_PLATFORM : 'test -e %(file)s && "$(MAKE)" $(MAKE_FLAGS) -f %(file)s'\r
}\r
\r
_INCLUDE_CMD_ = {\r
- "nmake" : '!INCLUDE',\r
- "gmake" : "include"\r
+ NMAKE_FILETYPE : '!INCLUDE',\r
+ GMAKE_FILETYPE : "include"\r
}\r
\r
_INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "RVCT" : "-I", "NASM" : "-I"}\r
#\r
def __init__(self, AutoGenObject):\r
self._AutoGenObject = AutoGenObject\r
- self._FileType = gMakeType\r
\r
- ## Create build file\r
+ MakePath = AutoGenObject.BuildOption.get('MAKE', {}).get('PATH')\r
+ if not MakePath:\r
+ self._FileType = ""\r
+ elif "nmake" in MakePath:\r
+ self._FileType = NMAKE_FILETYPE\r
+ else:\r
+ self._FileType = "gmake"\r
+\r
+ if sys.platform == "win32":\r
+ self._Platform = WIN32_PLATFORM\r
+ else:\r
+ self._Platform = POSIX_PLATFORM\r
+\r
+ ## Create build file.\r
#\r
- # @param FileType Type of build file. Only nmake and gmake are supported now.\r
+ # Only nmake and gmake are supported.\r
#\r
- # @retval TRUE The build file is created or re-created successfully\r
- # @retval FALSE The build file exists and is the same as the one to be generated\r
+ # @retval TRUE The build file is created or re-created successfully.\r
+ # @retval FALSE The build file exists and is the same as the one to be generated.\r
#\r
- def Generate(self, FileType=gMakeType):\r
- if FileType not in self._FILE_NAME_:\r
- EdkLogger.error("build", PARAMETER_INVALID, "Invalid build type [%s]" % FileType,\r
- ExtraData="[%s]" % str(self._AutoGenObject))\r
- self._FileType = FileType\r
+ def Generate(self):\r
FileContent = self._TEMPLATE_.Replace(self._TemplateDict)\r
- FileName = self._FILE_NAME_[FileType]\r
+ FileName = self.getMakefileName()\r
+ if not os.path.exists(os.path.join(self._AutoGenObject.MakeFileDir, "deps.txt")):\r
+ with open(os.path.join(self._AutoGenObject.MakeFileDir, "deps.txt"),"w+") as fd:\r
+ fd.write("")\r
+ if not os.path.exists(os.path.join(self._AutoGenObject.MakeFileDir, "dependency")):\r
+ with open(os.path.join(self._AutoGenObject.MakeFileDir, "dependency"),"w+") as fd:\r
+ fd.write("")\r
+ if not os.path.exists(os.path.join(self._AutoGenObject.MakeFileDir, "deps_target")):\r
+ with open(os.path.join(self._AutoGenObject.MakeFileDir, "deps_target"),"w+") as fd:\r
+ fd.write("")\r
return SaveFileOnChange(os.path.join(self._AutoGenObject.MakeFileDir, FileName), FileContent, False)\r
\r
## Return a list of directory creation command string\r
# @retval list The directory creation command list\r
#\r
def GetCreateDirectoryCommand(self, DirList):\r
- return [self._MD_TEMPLATE_[self._FileType] % {'dir':Dir} for Dir in DirList]\r
+ return [self._MD_TEMPLATE_[self._Platform] % {'dir':Dir} for Dir in DirList]\r
\r
## Return a list of directory removal command string\r
#\r
# @retval list The directory removal command list\r
#\r
def GetRemoveDirectoryCommand(self, DirList):\r
- return [self._RD_TEMPLATE_[self._FileType] % {'dir':Dir} for Dir in DirList]\r
+ return [self._RD_TEMPLATE_[self._Platform] % {'dir':Dir} for Dir in DirList]\r
\r
- def PlaceMacro(self, Path, MacroDefinitions={}):\r
+ def PlaceMacro(self, Path, MacroDefinitions=None):\r
if Path.startswith("$("):\r
return Path\r
else:\r
+ if MacroDefinitions is None:\r
+ MacroDefinitions = {}\r
PathLength = len(Path)\r
for MacroName in MacroDefinitions:\r
MacroValue = MacroDefinitions[MacroName]\r
${BEGIN}${file_macro}\r
${END}\r
\r
-COMMON_DEPS = ${BEGIN}${common_dependency_file} \\\r
- ${END}\r
-\r
#\r
# Overridable Target Macro Definitions\r
#\r
\t@"$(MAKE)" $(MAKE_FLAGS) -f $(BUILD_DIR)${separator}${makefile_name} fds\r
\t@cd $(MODULE_BUILD_DIR)\r
\r
+${INCLUDETAG}\r
+\r
#\r
# Individual Object Build Targets\r
#\r
self.CommonFileDependency = []\r
self.FileListMacros = {}\r
self.ListFileMacros = {}\r
-\r
+ self.ObjTargetDict = OrderedDict()\r
self.FileCache = {}\r
self.LibraryBuildCommandList = []\r
self.LibraryFileList = []\r
self.GenFfsList = ModuleAutoGen.GenFfsList\r
self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR']\r
self.FfsOutputFileList = []\r
+ self.DependencyHeaderFileSet = set()\r
\r
# Compose a dict object containing information used to do replacement in template\r
@property\r
def _TemplateDict(self):\r
- if self._FileType not in self._SEP_:\r
- EdkLogger.error("build", PARAMETER_INVALID, "Invalid Makefile type [%s]" % self._FileType,\r
- ExtraData="[%s]" % str(self._AutoGenObject))\r
MyAgo = self._AutoGenObject\r
- Separator = self._SEP_[self._FileType]\r
+ Separator = self._SEP_[self._Platform]\r
\r
# break build if no source files and binary files are found\r
if len(MyAgo.SourceFileList) == 0 and len(MyAgo.BinaryFileList) == 0:\r
UnexpandMacro = []\r
NewStr = []\r
for Str in StrList:\r
- if '$' in Str:\r
+ if '$' in Str or '-MMD' in Str or '-MF' in Str:\r
UnexpandMacro.append(Str)\r
else:\r
NewStr.append(Str)\r
)\r
FileMacroList.append(FileMacro)\r
# Add support when compiling .nasm source files\r
- for File in self.FileCache.keys():\r
- if not str(File).endswith('.nasm'):\r
- continue\r
- IncludePathList = []\r
+ IncludePathList = []\r
+ asmsource = [item for item in MyAgo.SourceFileList if item.File.upper().endswith((".NASM",".ASM",".NASMB","S"))]\r
+ if asmsource:\r
for P in MyAgo.IncludePathList:\r
IncludePath = self._INC_FLAG_['NASM'] + self.PlaceMacro(P, self.Macros)\r
if IncludePath.endswith(os.sep):\r
IncludePath = IncludePath.rstrip(os.sep)\r
- # When compiling .nasm files, need to add a literal backslash at each path\r
- # To specify a literal backslash at the end of the line, precede it with a caret (^)\r
- if P == MyAgo.IncludePathList[-1] and os.sep == '\\':\r
+ # When compiling .nasm files, need to add a literal backslash at each path.\r
+ # In nmake makfiles, a trailing literal backslash must be escaped with a caret ('^').\r
+ # It is otherwise replaced with a space (' '). This is not necessary for GNU makfefiles.\r
+ if P == MyAgo.IncludePathList[-1] and self._Platform == WIN32_PLATFORM and self._FileType == NMAKE_FILETYPE:\r
IncludePath = ''.join([IncludePath, '^', os.sep])\r
else:\r
IncludePath = os.path.join(IncludePath, '')\r
IncludePathList.append(IncludePath)\r
FileMacroList.append(self._FILE_MACRO_TEMPLATE.Replace({"macro_name": "NASM_INC", "source_file": IncludePathList}))\r
- break\r
\r
# Generate macros used to represent files containing list of input files\r
for ListFileMacro in self.ListFileMacros:\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
+ MakefileName = self.getMakefileName()\r
LibraryMakeCommandList = []\r
for D in self.LibraryBuildDirectoryList:\r
- Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":os.path.join(D, MakefileName)}\r
+ Command = self._MAKE_TEMPLATE_[self._Platform] % {"file":os.path.join(D, MakefileName)}\r
LibraryMakeCommandList.append(Command)\r
\r
package_rel_dir = MyAgo.SourceDir\r
"separator" : Separator,\r
"module_tool_definitions" : ToolsDef,\r
\r
- "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
- "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._Platform].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._Platform].values()),\r
\r
"module_entry_point" : ModuleEntryPoint,\r
"image_entry_point" : ImageEntryPoint,\r
"file_macro" : FileMacroList,\r
"file_build_target" : self.BuildTargetList,\r
"backward_compatible_target": BcTargetList,\r
+ "INCLUDETAG" : "\n".join([self._INCLUDE_CMD_[self._FileType] + " " + os.path.join("$(MODULE_BUILD_DIR)","dependency"),\r
+ self._INCLUDE_CMD_[self._FileType] + " " + os.path.join("$(MODULE_BUILD_DIR)","deps_target")\r
+ ])\r
}\r
\r
return MakefileTemplateDict\r
if Dst not in self.ResultFileList:\r
self.ResultFileList.append(Dst)\r
if '%s :' %(Dst) not in self.BuildTargetList:\r
- self.BuildTargetList.append("%s :" %(Dst))\r
- self.BuildTargetList.append('\t' + self._CP_TEMPLATE_[self._FileType] %{'Src': Src, 'Dst': Dst})\r
+ self.BuildTargetList.append("%s : %s" %(Dst,Src))\r
+ self.BuildTargetList.append('\t' + self._CP_TEMPLATE_[self._Platform] %{'Src': Src, 'Dst': Dst})\r
\r
FfsCmdList = Cmd[0]\r
for index, Str in enumerate(FfsCmdList):\r
if Item in SourceFileList:\r
SourceFileList.remove(Item)\r
\r
- FileDependencyDict = self.GetFileDependency(\r
- SourceFileList,\r
- ForceIncludedFile,\r
- self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList\r
- )\r
- DepSet = None\r
+ FileDependencyDict = {item:ForceIncludedFile for item in SourceFileList}\r
+\r
+ for Dependency in FileDependencyDict.values():\r
+ self.DependencyHeaderFileSet.update(set(Dependency))\r
+\r
+ # Get a set of unique package includes from MetaFile\r
+ parentMetaFileIncludes = set()\r
+ for aInclude in self._AutoGenObject.PackageIncludePathList:\r
+ aIncludeName = str(aInclude)\r
+ parentMetaFileIncludes.add(aIncludeName.lower())\r
+\r
+ # Check if header files are listed in metafile\r
+ # Get a set 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 set 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 set of unique module dependency header files\r
+ # Exclude autogen files and files not in the source directory\r
+ # and files that are under the package include list\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
+ # Exclude non-header files\r
+ if not aFileName.endswith('.h'):\r
+ continue\r
+ # Exclude autogen files\r
+ if aFileName in localAutoGenFileSet:\r
+ continue\r
+ # Exclude include out of local scope\r
+ if localSourceDir not in aFileName:\r
+ continue\r
+ # Exclude files covered by package includes\r
+ pathNeeded = True\r
+ for aIncludePath in parentMetaFileIncludes:\r
+ if aIncludePath in aFileName:\r
+ pathNeeded = False\r
+ break\r
+ if not pathNeeded:\r
+ continue\r
+ # Keep the file to be checked\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
+ if GlobalData.gUseHashCache:\r
+ GlobalData.gModuleBuildTracking[self._AutoGenObject] = 'FAIL_METAFILE'\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
for File,Dependency in FileDependencyDict.items():\r
if not Dependency:\r
- FileDependencyDict[File] = ['$(FORCE_REBUILD)']\r
continue\r
\r
self._AutoGenObject.AutoGenDepSet |= set(Dependency)\r
\r
- # skip non-C files\r
- if File.Ext not in [".c", ".C"] or File.Name == "AutoGen.c":\r
- continue\r
- elif DepSet is None:\r
- DepSet = set(Dependency)\r
- else:\r
- DepSet &= set(Dependency)\r
- # in case nothing in SourceFileList\r
- if DepSet is None:\r
- DepSet = set()\r
- #\r
- # Extract common files list in the dependency files\r
- #\r
- for File in DepSet:\r
- self.CommonFileDependency.append(self.PlaceMacro(File.Path, self.Macros))\r
-\r
- for File in FileDependencyDict:\r
- # skip non-C files\r
- if File.Ext not in [".c", ".C"] or File.Name == "AutoGen.c":\r
- continue\r
- NewDepSet = set(FileDependencyDict[File])\r
- NewDepSet -= DepSet\r
- FileDependencyDict[File] = ["$(COMMON_DEPS)"] + list(NewDepSet)\r
+ CmdSumDict = {}\r
+ CmdTargetDict = {}\r
+ CmdCppDict = {}\r
+ DependencyDict = FileDependencyDict.copy()\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
self.FileListMacros[T.FileListMacro].append(NewFile)\r
else:\r
Deps.append(NewFile)\r
-\r
+ for key in self.FileListMacros:\r
+ self.FileListMacros[key].sort()\r
# Use file list macro as dependency\r
if T.GenFileListMacro:\r
Deps.append("$(%s)" % T.FileListMacro)\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[3:].rsplit(TAB_SLASH, 1)[0]])):\r
+ Cpplist = CmdCppDict[T.Target.SubDir]\r
+ Cpplist.insert(0, '$(OBJLIST_%d): ' % 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
def GetFileDependency(self, FileList, ForceInculeList, SearchPathList):\r
Dependency = {}\r
for F in FileList:\r
- Dependency[F] = self.GetDependencyList(F, ForceInculeList, SearchPathList)\r
+ Dependency[F] = GetDependencyList(self._AutoGenObject, self.FileCache, F, ForceInculeList, SearchPathList)\r
return Dependency\r
\r
- ## Find dependencies for one source file\r
- #\r
- # By searching recursively "#include" directive in file, find out all the\r
- # files needed by given source file. The dependencies will be only searched\r
- # in given search path list.\r
- #\r
- # @param File The source file\r
- # @param ForceInculeList The list of files which will be included forcely\r
- # @param SearchPathList The list of search path\r
- #\r
- # @retval list The list of files the given source file depends on\r
- #\r
- def GetDependencyList(self, File, ForceList, SearchPathList):\r
- EdkLogger.debug(EdkLogger.DEBUG_1, "Try to get dependency files for %s" % File)\r
- FileStack = [File] + ForceList\r
- DependencySet = set()\r
-\r
- if self._AutoGenObject.Arch not in gDependencyDatabase:\r
- gDependencyDatabase[self._AutoGenObject.Arch] = {}\r
- DepDb = gDependencyDatabase[self._AutoGenObject.Arch]\r
-\r
- while len(FileStack) > 0:\r
- F = FileStack.pop()\r
-\r
- FullPathDependList = []\r
- if F in self.FileCache:\r
- for CacheFile in self.FileCache[F]:\r
- FullPathDependList.append(CacheFile)\r
- if CacheFile not in DependencySet:\r
- FileStack.append(CacheFile)\r
- DependencySet.update(FullPathDependList)\r
- continue\r
-\r
- CurrentFileDependencyList = []\r
- if F in DepDb:\r
- CurrentFileDependencyList = DepDb[F]\r
- else:\r
- try:\r
- Fd = open(F.Path, 'rb')\r
- FileContent = Fd.read()\r
- Fd.close()\r
- except BaseException as X:\r
- EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))\r
- if len(FileContent) == 0:\r
- continue\r
- try:\r
- if FileContent[0] == 0xff or FileContent[0] == 0xfe:\r
- FileContent = FileContent.decode('utf-16')\r
- else:\r
- FileContent = FileContent.decode()\r
- except:\r
- # The file is not txt file. for example .mcb file\r
- continue\r
- IncludedFileList = gIncludePattern.findall(FileContent)\r
-\r
- for Inc in IncludedFileList:\r
- Inc = Inc.strip()\r
- # if there's macro used to reference header file, expand it\r
- HeaderList = gMacroPattern.findall(Inc)\r
- if len(HeaderList) == 1 and len(HeaderList[0]) == 2:\r
- HeaderType = HeaderList[0][0]\r
- HeaderKey = HeaderList[0][1]\r
- if HeaderType in gIncludeMacroConversion:\r
- Inc = gIncludeMacroConversion[HeaderType] % {"HeaderKey" : HeaderKey}\r
- else:\r
- # not known macro used in #include, always build the file by\r
- # returning a empty dependency\r
- self.FileCache[File] = []\r
- return []\r
- Inc = os.path.normpath(Inc)\r
- CurrentFileDependencyList.append(Inc)\r
- DepDb[F] = CurrentFileDependencyList\r
-\r
- CurrentFilePath = F.Dir\r
- PathList = [CurrentFilePath] + SearchPathList\r
- for Inc in CurrentFileDependencyList:\r
- for SearchPath in PathList:\r
- FilePath = os.path.join(SearchPath, Inc)\r
- if FilePath in gIsFileMap:\r
- if not gIsFileMap[FilePath]:\r
- continue\r
- # If isfile is called too many times, the performance is slow down.\r
- elif not os.path.isfile(FilePath):\r
- gIsFileMap[FilePath] = False\r
- continue\r
- else:\r
- gIsFileMap[FilePath] = True\r
- FilePath = PathClass(FilePath)\r
- FullPathDependList.append(FilePath)\r
- if FilePath not in DependencySet:\r
- FileStack.append(FilePath)\r
- break\r
- else:\r
- EdkLogger.debug(EdkLogger.DEBUG_9, "%s included by %s was not found "\\r
- "in any given path:\n\t%s" % (Inc, F, "\n\t".join(SearchPathList)))\r
-\r
- self.FileCache[F] = FullPathDependList\r
- DependencySet.update(FullPathDependList)\r
-\r
- DependencySet.update(ForceList)\r
- if File in DependencySet:\r
- DependencySet.remove(File)\r
- DependencyList = list(DependencySet) # remove duplicate ones\r
-\r
- return DependencyList\r
\r
## CustomMakefile class\r
#\r
BuildFile.__init__(self, ModuleAutoGen)\r
self.PlatformInfo = self._AutoGenObject.PlatformInfo\r
self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"]\r
+ self.DependencyHeaderFileSet = set()\r
\r
# Compose a dict object containing information used to do replacement in template\r
@property\r
def _TemplateDict(self):\r
- Separator = self._SEP_[self._FileType]\r
+ Separator = self._SEP_[self._Platform]\r
MyAgo = self._AutoGenObject\r
if self._FileType not in MyAgo.CustomMakefile:\r
EdkLogger.error('build', OPTION_NOT_SUPPORTED, "No custom makefile for %s" % self._FileType,\r
ToolsDef.append("%s_%s = %s" % (Tool, Attr, MyAgo.BuildOption[Tool][Attr]))\r
ToolsDef.append("")\r
\r
- MakefileName = self._FILE_NAME_[self._FileType]\r
+ MakefileName = self.getMakefileName()\r
MakefileTemplateDict = {\r
"makefile_header" : self._FILE_HEADER_[self._FileType],\r
"makefile_path" : os.path.join("$(MODULE_BUILD_DIR)", MakefileName),\r
"separator" : Separator,\r
"module_tool_definitions" : ToolsDef,\r
\r
- "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
- "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._Platform].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._Platform].values()),\r
\r
"create_directory_command" : self.GetCreateDirectoryCommand(self.IntermediateDirectoryList),\r
"custom_makefile_content" : CustomMakefile\r
self.ModuleBuildDirectoryList = []\r
self.LibraryBuildDirectoryList = []\r
self.LibraryMakeCommandList = []\r
+ self.DependencyHeaderFileSet = set()\r
\r
# Compose a dict object containing information used to do replacement in template\r
@property\r
def _TemplateDict(self):\r
- Separator = self._SEP_[self._FileType]\r
+ Separator = self._SEP_[self._Platform]\r
\r
MyAgo = self._AutoGenObject\r
if "MAKE" not in MyAgo.ToolDefinition or "PATH" not in MyAgo.ToolDefinition["MAKE"]:\r
self.ModuleBuildDirectoryList = self.GetModuleBuildDirectoryList()\r
self.LibraryBuildDirectoryList = self.GetLibraryBuildDirectoryList()\r
\r
- MakefileName = self._FILE_NAME_[self._FileType]\r
+ MakefileName = self.getMakefileName()\r
LibraryMakefileList = []\r
LibraryMakeCommandList = []\r
for D in self.LibraryBuildDirectoryList:\r
D = self.PlaceMacro(D, {"BUILD_DIR":MyAgo.BuildDir})\r
Makefile = os.path.join(D, MakefileName)\r
- Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":Makefile}\r
+ Command = self._MAKE_TEMPLATE_[self._Platform] % {"file":Makefile}\r
LibraryMakefileList.append(Makefile)\r
LibraryMakeCommandList.append(Command)\r
self.LibraryMakeCommandList = LibraryMakeCommandList\r
for D in self.ModuleBuildDirectoryList:\r
D = self.PlaceMacro(D, {"BUILD_DIR":MyAgo.BuildDir})\r
Makefile = os.path.join(D, MakefileName)\r
- Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":Makefile}\r
+ Command = self._MAKE_TEMPLATE_[self._Platform] % {"file":Makefile}\r
ModuleMakefileList.append(Makefile)\r
ModuleMakeCommandList.append(Command)\r
\r
\r
"toolchain_tag" : MyAgo.ToolChain,\r
"build_target" : MyAgo.BuildTarget,\r
- "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
- "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._Platform].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._Platform].values()),\r
"build_architecture_list" : MyAgo.Arch,\r
"architecture" : MyAgo.Arch,\r
"separator" : Separator,\r
def __init__(self, Workspace):\r
BuildFile.__init__(self, Workspace)\r
self.IntermediateDirectoryList = []\r
+ self.DependencyHeaderFileSet = set()\r
\r
# Compose a dict object containing information used to do replacement in template\r
@property\r
def _TemplateDict(self):\r
- Separator = self._SEP_[self._FileType]\r
+ Separator = self._SEP_[self._Platform]\r
\r
# any platform autogen object is ok because we just need common information\r
MyAgo = self._AutoGenObject\r
\r
if GlobalData.gCaseInsensitive:\r
ExtraOption += " -c"\r
- if GlobalData.gEnableGenfdsMultiThread:\r
- ExtraOption += " --genfds-multi-thread"\r
+ if not GlobalData.gEnableGenfdsMultiThread:\r
+ ExtraOption += " --no-genfds-multi-thread"\r
if GlobalData.gIgnoreSource:\r
ExtraOption += " --ignore-sources"\r
\r
else:\r
ExtraOption += " --pcd " + pcdname + '=' + pcd[3]\r
\r
- MakefileName = self._FILE_NAME_[self._FileType]\r
+ MakefileName = self.getMakefileName()\r
SubBuildCommandList = []\r
for A in MyAgo.ArchList:\r
- Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":os.path.join("$(BUILD_DIR)", A, MakefileName)}\r
+ Command = self._MAKE_TEMPLATE_[self._Platform] % {"file":os.path.join("$(BUILD_DIR)", A, MakefileName)}\r
SubBuildCommandList.append(Command)\r
\r
MakefileTemplateDict = {\r
\r
"toolchain_tag" : MyAgo.ToolChain,\r
"build_target" : MyAgo.BuildTarget,\r
- "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
- "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._Platform].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._Platform].values()),\r
'arch' : list(MyAgo.ArchList),\r
"build_architecture_list" : ','.join(MyAgo.ArchList),\r
"separator" : Separator,\r
DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
+## Find dependencies for one source file\r
+#\r
+# By searching recursively "#include" directive in file, find out all the\r
+# files needed by given source file. The dependencies will be only searched\r
+# in given search path list.\r
+#\r
+# @param File The source file\r
+# @param ForceInculeList The list of files which will be included forcely\r
+# @param SearchPathList The list of search path\r
+#\r
+# @retval list The list of files the given source file depends on\r
+#\r
+def GetDependencyList(AutoGenObject, FileCache, File, ForceList, SearchPathList):\r
+ EdkLogger.debug(EdkLogger.DEBUG_1, "Try to get dependency files for %s" % File)\r
+ FileStack = [File] + ForceList\r
+ DependencySet = set()\r
+\r
+ if AutoGenObject.Arch not in gDependencyDatabase:\r
+ gDependencyDatabase[AutoGenObject.Arch] = {}\r
+ DepDb = gDependencyDatabase[AutoGenObject.Arch]\r
+\r
+ while len(FileStack) > 0:\r
+ F = FileStack.pop()\r
+\r
+ FullPathDependList = []\r
+ if F in FileCache:\r
+ for CacheFile in FileCache[F]:\r
+ FullPathDependList.append(CacheFile)\r
+ if CacheFile not in DependencySet:\r
+ FileStack.append(CacheFile)\r
+ DependencySet.update(FullPathDependList)\r
+ continue\r
+\r
+ CurrentFileDependencyList = []\r
+ if F in DepDb:\r
+ CurrentFileDependencyList = DepDb[F]\r
+ else:\r
+ try:\r
+ Fd = open(F.Path, 'rb')\r
+ FileContent = Fd.read()\r
+ Fd.close()\r
+ except BaseException as X:\r
+ EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))\r
+ if len(FileContent) == 0:\r
+ continue\r
+ try:\r
+ if FileContent[0] == 0xff or FileContent[0] == 0xfe:\r
+ FileContent = FileContent.decode('utf-16')\r
+ else:\r
+ FileContent = FileContent.decode()\r
+ except:\r
+ # The file is not txt file. for example .mcb file\r
+ continue\r
+ IncludedFileList = gIncludePattern.findall(FileContent)\r
+\r
+ for Inc in IncludedFileList:\r
+ Inc = Inc.strip()\r
+ # if there's macro used to reference header file, expand it\r
+ HeaderList = gMacroPattern.findall(Inc)\r
+ if len(HeaderList) == 1 and len(HeaderList[0]) == 2:\r
+ HeaderType = HeaderList[0][0]\r
+ HeaderKey = HeaderList[0][1]\r
+ if HeaderType in gIncludeMacroConversion:\r
+ Inc = gIncludeMacroConversion[HeaderType] % {"HeaderKey" : HeaderKey}\r
+ else:\r
+ # not known macro used in #include, always build the file by\r
+ # returning a empty dependency\r
+ FileCache[File] = []\r
+ return []\r
+ Inc = os.path.normpath(Inc)\r
+ CurrentFileDependencyList.append(Inc)\r
+ DepDb[F] = CurrentFileDependencyList\r
+\r
+ CurrentFilePath = F.Dir\r
+ PathList = [CurrentFilePath] + SearchPathList\r
+ for Inc in CurrentFileDependencyList:\r
+ for SearchPath in PathList:\r
+ FilePath = os.path.join(SearchPath, Inc)\r
+ if FilePath in gIsFileMap:\r
+ if not gIsFileMap[FilePath]:\r
+ continue\r
+ # If isfile is called too many times, the performance is slow down.\r
+ elif not os.path.isfile(FilePath):\r
+ gIsFileMap[FilePath] = False\r
+ continue\r
+ else:\r
+ gIsFileMap[FilePath] = True\r
+ FilePath = PathClass(FilePath)\r
+ FullPathDependList.append(FilePath)\r
+ if FilePath not in DependencySet:\r
+ FileStack.append(FilePath)\r
+ break\r
+ else:\r
+ EdkLogger.debug(EdkLogger.DEBUG_9, "%s included by %s was not found "\\r
+ "in any given path:\n\t%s" % (Inc, F, "\n\t".join(SearchPathList)))\r
+\r
+ FileCache[F] = FullPathDependList\r
+ DependencySet.update(FullPathDependList)\r
+\r
+ DependencySet.update(ForceList)\r
+ if File in DependencySet:\r
+ DependencySet.remove(File)\r
+ DependencyList = list(DependencySet) # remove duplicate ones\r
+\r
+ return DependencyList\r
+\r
# This acts like the main() function for the script, unless it is 'import'ed into another script.\r
if __name__ == '__main__':\r
pass\r
-\r
projects / mirror_edk2.git / blobdiff