## @file\r
# Create makefile for MS nmake and GNU make\r
#\r
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
import re\r
import os.path as path\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
-\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
from Common.BuildToolError import *\r
from Common.Misc import *\r
from Common.String import *\r
from BuildEngine import *\r
import Common.GlobalData as GlobalData\r
+from collections import OrderedDict\r
\r
## Regular expression for finding header file inclusions\r
-gIncludePattern = re.compile(r"^[ \t]*#?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[\"<]?[ \t]*)([-\w.\\/() \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE|re.UNICODE|re.IGNORECASE)\r
+gIncludePattern = re.compile(r"^[ \t]*#?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[\"<]?[ \t]*)([-\w.\\/() \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNICODE | re.IGNORECASE)\r
\r
## Regular expression for matching macro used in header file inclusion\r
gMacroPattern = re.compile("([_A-Z][_A-Z0-9]*)[ \t]*\((.+)\)", re.UNICODE)\r
"nmake" : 'if exist %(dir)s $(RD) %(dir)s',\r
"gmake" : "$(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
+ }\r
\r
_CD_TEMPLATE_ = {\r
"nmake" : 'if exist %(dir)s cd %(dir)s',\r
for MacroName in MacroDefinitions:\r
MacroValue = MacroDefinitions[MacroName]\r
MacroValueLength = len(MacroValue)\r
+ if MacroValueLength == 0:\r
+ continue\r
if MacroValueLength <= PathLength and Path.startswith(MacroValue):\r
Path = "$(%s)%s" % (MacroName, Path[MacroValueLength:])\r
break\r
PLATFORM_GUID = ${platform_guid}\r
PLATFORM_VERSION = ${platform_version}\r
PLATFORM_RELATIVE_DIR = ${platform_relative_directory}\r
-PLATFORM_DIR = $(WORKSPACE)${separator}${platform_relative_directory}\r
+PLATFORM_DIR = ${platform_dir}\r
PLATFORM_OUTPUT_DIR = ${platform_output_directory}\r
\r
#\r
#\r
MODULE_NAME = ${module_name}\r
MODULE_GUID = ${module_guid}\r
+MODULE_NAME_GUID = ${module_name_guid}\r
MODULE_VERSION = ${module_version}\r
MODULE_TYPE = ${module_type}\r
MODULE_FILE = ${module_file}\r
MODULE_FILE_BASE_NAME = ${module_file_base_name}\r
BASE_NAME = $(MODULE_NAME)\r
MODULE_RELATIVE_DIR = ${module_relative_directory}\r
-MODULE_DIR = $(WORKSPACE)${separator}${module_relative_directory}\r
+PACKAGE_RELATIVE_DIR = ${package_relative_directory}\r
+MODULE_DIR = ${module_dir}\r
+FFS_OUTPUT_DIR = ${ffs_output_directory}\r
\r
MODULE_ENTRY_POINT = ${module_entry_point}\r
ARCH_ENTRY_POINT = ${arch_entry_point}\r
#\r
clean:\r
\t${BEGIN}${clean_command}\r
-\t${END}\r
+\t${END}\t$(RM) AutoGenTimeStamp\r
\r
#\r
# clean all generated files\r
${BEGIN}\t${cleanall_command}\r
${END}\t$(RM) *.pdb *.idb > NUL 2>&1\r
\t$(RM) $(BIN_DIR)${separator}$(MODULE_NAME).efi\r
+\t$(RM) AutoGenTimeStamp\r
\r
#\r
# clean all dependent libraries built\r
self.ResultFileList = []\r
self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"]\r
\r
- self.SourceFileDatabase = {} # {file type : file path}\r
- self.DestFileDatabase = {} # {file type : file path}\r
self.FileBuildTargetList = [] # [(src, target string)]\r
self.BuildTargetList = [] # [target string]\r
self.PendingBuildTargetList = [] # [FileBuildRule objects]\r
self.LibraryMakefileList = []\r
self.LibraryBuildDirectoryList = []\r
self.SystemLibraryList = []\r
- self.Macros = sdict()\r
+ self.Macros = OrderedDict()\r
self.Macros["OUTPUT_DIR" ] = self._AutoGenObject.Macros["OUTPUT_DIR"]\r
self.Macros["DEBUG_DIR" ] = self._AutoGenObject.Macros["DEBUG_DIR"]\r
self.Macros["MODULE_BUILD_DIR"] = self._AutoGenObject.Macros["MODULE_BUILD_DIR"]\r
self.Macros["BIN_DIR" ] = self._AutoGenObject.Macros["BIN_DIR"]\r
self.Macros["BUILD_DIR" ] = self._AutoGenObject.Macros["BUILD_DIR"]\r
self.Macros["WORKSPACE" ] = self._AutoGenObject.Macros["WORKSPACE"]\r
+ self.Macros["FFS_OUTPUT_DIR" ] = self._AutoGenObject.Macros["FFS_OUTPUT_DIR"]\r
+ self.GenFfsList = ModuleAutoGen.GenFfsList\r
+ self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR']\r
+ self.FfsOutputFileList = []\r
\r
# Compose a dict object containing information used to do replacement in template\r
def _CreateTemplateDict(self):\r
# EdkII modules always use "_ModuleEntryPoint" as entry point\r
ImageEntryPoint = "_ModuleEntryPoint"\r
\r
+ for k, v in self._AutoGenObject.Module.Defines.iteritems():\r
+ if k not in self._AutoGenObject.Macros:\r
+ self._AutoGenObject.Macros[k] = v\r
+\r
+ if 'MODULE_ENTRY_POINT' not in self._AutoGenObject.Macros:\r
+ self._AutoGenObject.Macros['MODULE_ENTRY_POINT'] = ModuleEntryPoint\r
+ if 'ARCH_ENTRY_POINT' not in self._AutoGenObject.Macros:\r
+ self._AutoGenObject.Macros['ARCH_ENTRY_POINT'] = ArchEntryPoint\r
+ if 'IMAGE_ENTRY_POINT' not in self._AutoGenObject.Macros:\r
+ self._AutoGenObject.Macros['IMAGE_ENTRY_POINT'] = ImageEntryPoint\r
+\r
+ PCI_COMPRESS_Flag = False\r
+ for k, v in self._AutoGenObject.Module.Defines.iteritems():\r
+ if 'PCI_COMPRESS' == k and 'TRUE' == v:\r
+ PCI_COMPRESS_Flag = True\r
+\r
# tools definitions\r
ToolsDef = []\r
IncPrefix = self._INC_FLAG_[self._AutoGenObject.ToolChainFamily]\r
# Remove duplicated include path, if any\r
if Attr == "FLAGS":\r
Value = RemoveDupOption(Value, IncPrefix, self._AutoGenObject.IncludePathList)\r
+ if Tool == "OPTROM" and PCI_COMPRESS_Flag:\r
+ ValueList = Value.split()\r
+ if ValueList:\r
+ for i, v in enumerate(ValueList):\r
+ if '-e' == v:\r
+ ValueList[i] = '-ec'\r
+ Value = ' '.join(ValueList)\r
+\r
ToolsDef.append("%s_%s = %s" % (Tool, Attr, Value))\r
ToolsDef.append("")\r
\r
+ # generate the Response file and Response flag\r
+ RespDict = self.CommandExceedLimit()\r
+ RespFileList = os.path.join(self._AutoGenObject.OutputDir, 'respfilelist.txt')\r
+ if RespDict:\r
+ RespFileListContent = ''\r
+ for Resp in RespDict:\r
+ RespFile = os.path.join(self._AutoGenObject.OutputDir, str(Resp).lower() + '.txt')\r
+ StrList = RespDict[Resp].split(' ')\r
+ UnexpandMacro = []\r
+ NewStr = []\r
+ for Str in StrList:\r
+ if '$' in Str:\r
+ UnexpandMacro.append(Str)\r
+ else:\r
+ NewStr.append(Str)\r
+ UnexpandMacroStr = ' '.join(UnexpandMacro)\r
+ NewRespStr = ' '.join(NewStr)\r
+ SaveFileOnChange(RespFile, NewRespStr, False)\r
+ ToolsDef.append("%s = %s" % (Resp, UnexpandMacroStr + ' @' + RespFile))\r
+ RespFileListContent += '@' + RespFile + os.linesep\r
+ RespFileListContent += NewRespStr + os.linesep\r
+ SaveFileOnChange(RespFileList, RespFileListContent, False)\r
+ else:\r
+ if os.path.exists(RespFileList):\r
+ os.remove(RespFileList)\r
+\r
# convert source files and binary files to build targets\r
self.ResultFileList = [str(T.Target) for T in self._AutoGenObject.CodaTargetList]\r
- if len(self.ResultFileList) == 0 and len(self._AutoGenObject.SourceFileList) <> 0: \r
+ if len(self.ResultFileList) == 0 and len(self._AutoGenObject.SourceFileList) <> 0:\r
EdkLogger.error("build", AUTOGEN_ERROR, "Nothing to build",\r
ExtraData="[%s]" % str(self._AutoGenObject))\r
\r
self.ProcessBuildTargetList()\r
+ self.ParserGenerateFfsCmd()\r
\r
# Generate macros used to represent input files\r
FileMacroList = [] # macro name = file list\r
FileMacro = ""\r
IncludePathList = []\r
for P in self._AutoGenObject.IncludePathList:\r
- IncludePathList.append(IncPrefix+self.PlaceMacro(P, self.Macros))\r
+ IncludePathList.append(IncPrefix + self.PlaceMacro(P, self.Macros))\r
if FileBuildRule.INC_LIST_MACRO in self.ListFileMacros:\r
- self.ListFileMacros[FileBuildRule.INC_LIST_MACRO].append(IncPrefix+P)\r
+ self.ListFileMacros[FileBuildRule.INC_LIST_MACRO].append(IncPrefix + P)\r
FileMacro += self._FILE_MACRO_TEMPLATE.Replace(\r
{\r
"macro_name" : "INC",\r
\r
# Generate macros used to represent files containing list of input files\r
for ListFileMacro in self.ListFileMacros:\r
- ListFileName = os.path.join(self._AutoGenObject.OutputDir, "%s.lst" % ListFileMacro.lower()[:len(ListFileMacro)-5])\r
+ ListFileName = os.path.join(self._AutoGenObject.OutputDir, "%s.lst" % ListFileMacro.lower()[:len(ListFileMacro) - 5])\r
FileMacroList.append("%s = %s" % (ListFileMacro, ListFileName))\r
SaveFileOnChange(\r
ListFileName,\r
Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":os.path.join(D, MakefileName)}\r
LibraryMakeCommandList.append(Command)\r
\r
+ package_rel_dir = self._AutoGenObject.SourceDir\r
+ current_dir = self.Macros["WORKSPACE"]\r
+ found = False\r
+ while not found and os.sep in package_rel_dir:\r
+ index = package_rel_dir.index(os.sep)\r
+ current_dir = mws.join(current_dir, package_rel_dir[:index])\r
+ if os.path.exists(current_dir):\r
+ for fl in os.listdir(current_dir):\r
+ if fl.endswith('.dec'):\r
+ found = True\r
+ break\r
+ package_rel_dir = package_rel_dir[index + 1:]\r
+\r
MakefileTemplateDict = {\r
"makefile_header" : self._FILE_HEADER_[self._FileType],\r
"makefile_path" : os.path.join("$(MODULE_BUILD_DIR)", MakefileName),\r
"platform_version" : self.PlatformInfo.Version,\r
"platform_relative_directory": self.PlatformInfo.SourceDir,\r
"platform_output_directory" : self.PlatformInfo.OutputDir,\r
+ "ffs_output_directory" : self._AutoGenObject.Macros["FFS_OUTPUT_DIR"],\r
+ "platform_dir" : self._AutoGenObject.Macros["PLATFORM_DIR"],\r
\r
"module_name" : self._AutoGenObject.Name,\r
"module_guid" : self._AutoGenObject.Guid,\r
+ "module_name_guid" : self._AutoGenObject._GetUniqueBaseName(),\r
"module_version" : self._AutoGenObject.Version,\r
"module_type" : self._AutoGenObject.ModuleType,\r
"module_file" : self._AutoGenObject.MetaFile.Name,\r
"module_file_base_name" : self._AutoGenObject.MetaFile.BaseName,\r
"module_relative_directory" : self._AutoGenObject.SourceDir,\r
- "module_extra_defines" : ["%s = %s" % (k, v) for k,v in self._AutoGenObject.Module.Defines.iteritems()],\r
+ "module_dir" : mws.join (self.Macros["WORKSPACE"], self._AutoGenObject.SourceDir),\r
+ "package_relative_directory": package_rel_dir,\r
+ "module_extra_defines" : ["%s = %s" % (k, v) for k, v in self._AutoGenObject.Module.Defines.iteritems()],\r
\r
"architecture" : self._AutoGenObject.Arch,\r
"toolchain_tag" : self._AutoGenObject.ToolChain,\r
\r
return MakefileTemplateDict\r
\r
+ def ParserGenerateFfsCmd(self):\r
+ #Add Ffs cmd to self.BuildTargetList\r
+ OutputFile = ''\r
+ DepsFileList = []\r
+\r
+ for Cmd in self.GenFfsList:\r
+ if Cmd[2]:\r
+ for CopyCmd in Cmd[2]:\r
+ Src, Dst = CopyCmd\r
+ Src = self.ReplaceMacro(Src)\r
+ Dst = self.ReplaceMacro(Dst)\r
+ if Dst not in self.ResultFileList:\r
+ self.ResultFileList.append('%s' % 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
+\r
+ FfsCmdList = Cmd[0]\r
+ for index, Str in enumerate(FfsCmdList):\r
+ if '-o' == Str:\r
+ OutputFile = FfsCmdList[index + 1]\r
+ if '-i' == Str:\r
+ if DepsFileList == []:\r
+ DepsFileList = [FfsCmdList[index + 1]]\r
+ else:\r
+ DepsFileList.append(FfsCmdList[index + 1])\r
+ DepsFileString = ' '.join(DepsFileList).strip()\r
+ if DepsFileString == '':\r
+ continue\r
+ OutputFile = self.ReplaceMacro(OutputFile)\r
+ self.ResultFileList.append('%s' % OutputFile)\r
+ DepsFileString = self.ReplaceMacro(DepsFileString)\r
+ self.BuildTargetList.append('%s : %s' % (OutputFile, DepsFileString))\r
+ CmdString = ' '.join(FfsCmdList).strip()\r
+ CmdString = self.ReplaceMacro(CmdString)\r
+ self.BuildTargetList.append('\t%s' % CmdString)\r
+\r
+ self.ParseSecCmd(DepsFileList, Cmd[1])\r
+ for SecOutputFile, SecDepsFile, SecCmd in self.FfsOutputFileList :\r
+ self.BuildTargetList.append('%s : %s' % (self.ReplaceMacro(SecOutputFile), self.ReplaceMacro(SecDepsFile)))\r
+ self.BuildTargetList.append('\t%s' % self.ReplaceMacro(SecCmd))\r
+ self.FfsOutputFileList = []\r
+\r
+ def ParseSecCmd(self, OutputFileList, CmdTuple):\r
+ for OutputFile in OutputFileList:\r
+ for SecCmdStr in CmdTuple:\r
+ SecDepsFileList = []\r
+ SecCmdList = SecCmdStr.split()\r
+ CmdName = SecCmdList[0]\r
+ for index, CmdItem in enumerate(SecCmdList):\r
+ if '-o' == CmdItem and OutputFile == SecCmdList[index + 1]:\r
+ index = index + 1\r
+ while index + 1 < len(SecCmdList):\r
+ if not SecCmdList[index+1].startswith('-'):\r
+ SecDepsFileList.append(SecCmdList[index + 1])\r
+ index = index + 1\r
+ if CmdName == 'Trim':\r
+ SecDepsFileList.append(os.path.join('$(DEBUG_DIR)', os.path.basename(OutputFile).replace('offset', 'efi')))\r
+ if OutputFile.endswith('.ui') or OutputFile.endswith('.ver'):\r
+ SecDepsFileList.append(os.path.join('$(MODULE_DIR)','$(MODULE_FILE)'))\r
+ self.FfsOutputFileList.append((OutputFile, ' '.join(SecDepsFileList), SecCmdStr))\r
+ if len(SecDepsFileList) > 0:\r
+ self.ParseSecCmd(SecDepsFileList, CmdTuple)\r
+ break\r
+ else:\r
+ continue\r
+\r
+ def ReplaceMacro(self, str):\r
+ for Macro in self.MacroList:\r
+ if self._AutoGenObject.Macros[Macro] and self._AutoGenObject.Macros[Macro] in str:\r
+ str = str.replace(self._AutoGenObject.Macros[Macro], '$(' + Macro + ')')\r
+ return str\r
+\r
+ def CommandExceedLimit(self):\r
+ FlagDict = {\r
+ 'CC' : { 'Macro' : '$(CC_FLAGS)', 'Value' : False},\r
+ 'PP' : { 'Macro' : '$(PP_FLAGS)', 'Value' : False},\r
+ 'APP' : { 'Macro' : '$(APP_FLAGS)', 'Value' : False},\r
+ 'ASLPP' : { 'Macro' : '$(ASLPP_FLAGS)', 'Value' : False},\r
+ 'VFRPP' : { 'Macro' : '$(VFRPP_FLAGS)', 'Value' : False},\r
+ 'ASM' : { 'Macro' : '$(ASM_FLAGS)', 'Value' : False},\r
+ 'ASLCC' : { 'Macro' : '$(ASLCC_FLAGS)', 'Value' : False},\r
+ }\r
+\r
+ RespDict = {}\r
+ FileTypeList = []\r
+ IncPrefix = self._INC_FLAG_[self._AutoGenObject.ToolChainFamily]\r
+\r
+ # base on the source files to decide the file type\r
+ for File in self._AutoGenObject.SourceFileList:\r
+ for type in self._AutoGenObject.FileTypes:\r
+ if File in self._AutoGenObject.FileTypes[type]:\r
+ if type not in FileTypeList:\r
+ FileTypeList.append(type)\r
+\r
+ # calculate the command-line length\r
+ if FileTypeList:\r
+ for type in FileTypeList:\r
+ BuildTargets = self._AutoGenObject.BuildRules[type].BuildTargets\r
+ for Target in BuildTargets:\r
+ CommandList = BuildTargets[Target].Commands\r
+ for SingleCommand in CommandList:\r
+ Tool = ''\r
+ SingleCommandLength = len(SingleCommand)\r
+ SingleCommandList = SingleCommand.split()\r
+ if len(SingleCommandList) > 0:\r
+ for Flag in FlagDict:\r
+ if '$('+ Flag +')' in SingleCommandList[0]:\r
+ Tool = Flag\r
+ break\r
+ if Tool:\r
+ if 'PATH' not in self._AutoGenObject._BuildOption[Tool]:\r
+ EdkLogger.error("build", AUTOGEN_ERROR, "%s_PATH doesn't exist in %s ToolChain and %s Arch." %(Tool, self._AutoGenObject.ToolChain, self._AutoGenObject.Arch), ExtraData="[%s]" % str(self._AutoGenObject))\r
+ SingleCommandLength += len(self._AutoGenObject._BuildOption[Tool]['PATH'])\r
+ for item in SingleCommandList[1:]:\r
+ if FlagDict[Tool]['Macro'] in item:\r
+ if 'FLAGS' not in self._AutoGenObject._BuildOption[Tool]:\r
+ EdkLogger.error("build", AUTOGEN_ERROR, "%s_FLAGS doesn't exist in %s ToolChain and %s Arch." %(Tool, self._AutoGenObject.ToolChain, self._AutoGenObject.Arch), ExtraData="[%s]" % str(self._AutoGenObject))\r
+ Str = self._AutoGenObject._BuildOption[Tool]['FLAGS']\r
+ for Option in self._AutoGenObject.BuildOption:\r
+ for Attr in self._AutoGenObject.BuildOption[Option]:\r
+ if Str.find(Option + '_' + Attr) != -1:\r
+ Str = Str.replace('$(' + Option + '_' + Attr + ')', self._AutoGenObject.BuildOption[Option][Attr])\r
+ while(Str.find('$(') != -1):\r
+ for macro in self._AutoGenObject.Macros:\r
+ MacroName = '$('+ macro + ')'\r
+ if (Str.find(MacroName) != -1):\r
+ Str = Str.replace(MacroName, self._AutoGenObject.Macros[macro])\r
+ break\r
+ else:\r
+ break\r
+ SingleCommandLength += len(Str)\r
+ elif '$(INC)' in item:\r
+ SingleCommandLength += self._AutoGenObject.IncludePathLength + len(IncPrefix) * len(self._AutoGenObject._IncludePathList)\r
+ elif item.find('$(') != -1:\r
+ Str = item\r
+ for Option in self._AutoGenObject.BuildOption:\r
+ for Attr in self._AutoGenObject.BuildOption[Option]:\r
+ if Str.find(Option + '_' + Attr) != -1:\r
+ Str = Str.replace('$(' + Option + '_' + Attr + ')', self._AutoGenObject.BuildOption[Option][Attr])\r
+ while(Str.find('$(') != -1):\r
+ for macro in self._AutoGenObject.Macros:\r
+ MacroName = '$('+ macro + ')'\r
+ if (Str.find(MacroName) != -1):\r
+ Str = Str.replace(MacroName, self._AutoGenObject.Macros[macro])\r
+ break\r
+ else:\r
+ break\r
+ SingleCommandLength += len(Str)\r
+\r
+ if SingleCommandLength > GlobalData.gCommandMaxLength:\r
+ FlagDict[Tool]['Value'] = True\r
+\r
+ # generate the response file content by combine the FLAGS and INC\r
+ for Flag in FlagDict:\r
+ if FlagDict[Flag]['Value']:\r
+ Key = Flag + '_RESP'\r
+ RespMacro = FlagDict[Flag]['Macro'].replace('FLAGS', 'RESP')\r
+ Value = self._AutoGenObject.BuildOption[Flag]['FLAGS']\r
+ for inc in self._AutoGenObject._IncludePathList:\r
+ Value += ' ' + IncPrefix + inc\r
+ for Option in self._AutoGenObject.BuildOption:\r
+ for Attr in self._AutoGenObject.BuildOption[Option]:\r
+ if Value.find(Option + '_' + Attr) != -1:\r
+ Value = Value.replace('$(' + Option + '_' + Attr + ')', self._AutoGenObject.BuildOption[Option][Attr])\r
+ while (Value.find('$(') != -1):\r
+ for macro in self._AutoGenObject.Macros:\r
+ MacroName = '$('+ macro + ')'\r
+ if (Value.find(MacroName) != -1):\r
+ Value = Value.replace(MacroName, self._AutoGenObject.Macros[macro])\r
+ break\r
+ else:\r
+ break\r
+\r
+ if self._AutoGenObject.ToolChainFamily == 'GCC':\r
+ RespDict[Key] = Value.replace('\\', '/')\r
+ else:\r
+ RespDict[Key] = Value\r
+ for Target in BuildTargets:\r
+ for i, SingleCommand in enumerate(BuildTargets[Target].Commands):\r
+ if FlagDict[Flag]['Macro'] in SingleCommand:\r
+ BuildTargets[Target].Commands[i] = SingleCommand.replace('$(INC)','').replace(FlagDict[Flag]['Macro'], RespMacro)\r
+ return RespDict\r
+\r
def ProcessBuildTargetList(self):\r
#\r
# Search dependency file list for each source file\r
if File.Ext == '.h':\r
ForceIncludedFile.append(File)\r
SourceFileList = []\r
+ OutPutFileList = []\r
for Target in self._AutoGenObject.IntroTargetList:\r
SourceFileList.extend(Target.Inputs)\r
+ OutPutFileList.extend(Target.Outputs)\r
+\r
+ if OutPutFileList:\r
+ for Item in OutPutFileList:\r
+ if Item in SourceFileList:\r
+ SourceFileList.remove(Item)\r
\r
self.FileDependency = self.GetFileDependency(\r
SourceFileList,\r
if not self.FileDependency[File]:\r
self.FileDependency[File] = ['$(FORCE_REBUILD)']\r
continue\r
+\r
+ self._AutoGenObject.AutoGenDepSet |= set(self.FileDependency[File])\r
+\r
# skip non-C files\r
if File.Ext not in [".c", ".C"] or File.Name == "AutoGen.c":\r
continue\r
- elif DepSet == None:\r
+ elif DepSet is None:\r
DepSet = set(self.FileDependency[File])\r
else:\r
DepSet &= set(self.FileDependency[File])\r
# in case nothing in SourceFileList\r
- if DepSet == None:\r
+ if DepSet is None:\r
DepSet = set()\r
#\r
# Extract common files list in the dependency files\r
NewFile = self.PlaceMacro(str(F), self.Macros)\r
# In order to use file list macro as dependency\r
if T.GenListFile:\r
- self.ListFileMacros[T.ListFileMacro].append(str(F))\r
+ # gnu tools need forward slash path separater, even on Windows\r
+ self.ListFileMacros[T.ListFileMacro].append(str(F).replace ('\\', '/'))\r
self.FileListMacros[T.FileListMacro].append(NewFile)\r
elif T.GenFileListMacro:\r
self.FileListMacros[T.FileListMacro].append(NewFile)\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
## For creating makefile targets for dependent libraries\r
def ProcessDependentLibrary(self):\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- self.LibraryBuildDirectoryList.append(self.PlaceMacro(LibraryAutoGen.BuildDir, self.Macros))\r
+ if not LibraryAutoGen.IsBinaryModule:\r
+ self.LibraryBuildDirectoryList.append(self.PlaceMacro(LibraryAutoGen.BuildDir, self.Macros))\r
\r
## Return a list containing source file's dependencies\r
#\r
try:\r
Fd = open(F.Path, 'r')\r
except BaseException, X:\r
- EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path+"\n\t"+str(X))\r
+ EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))\r
\r
FileContent = Fd.read()\r
Fd.close()\r
PLATFORM_GUID = ${platform_guid}\r
PLATFORM_VERSION = ${platform_version}\r
PLATFORM_RELATIVE_DIR = ${platform_relative_directory}\r
-PLATFORM_DIR = $(WORKSPACE)${separator}${platform_relative_directory}\r
+PLATFORM_DIR = ${platform_dir}\r
PLATFORM_OUTPUT_DIR = ${platform_output_directory}\r
\r
#\r
#\r
MODULE_NAME = ${module_name}\r
MODULE_GUID = ${module_guid}\r
+MODULE_NAME_GUID = ${module_name_guid}\r
MODULE_VERSION = ${module_version}\r
MODULE_TYPE = ${module_type}\r
MODULE_FILE = ${module_file}\r
MODULE_FILE_BASE_NAME = ${module_file_base_name}\r
BASE_NAME = $(MODULE_NAME)\r
MODULE_RELATIVE_DIR = ${module_relative_directory}\r
-MODULE_DIR = $(WORKSPACE)${separator}${module_relative_directory}\r
+MODULE_DIR = ${module_dir}\r
\r
#\r
# Build Configuration Macro Definition\r
if self._FileType not in self._AutoGenObject.CustomMakefile:\r
EdkLogger.error('build', OPTION_NOT_SUPPORTED, "No custom makefile for %s" % self._FileType,\r
ExtraData="[%s]" % str(self._AutoGenObject))\r
- MakefilePath = os.path.join(\r
+ MakefilePath = mws.join(\r
self._AutoGenObject.WorkspaceDir,\r
self._AutoGenObject.CustomMakefile[self._FileType]\r
)\r
"platform_version" : self.PlatformInfo.Version,\r
"platform_relative_directory": self.PlatformInfo.SourceDir,\r
"platform_output_directory" : self.PlatformInfo.OutputDir,\r
+ "platform_dir" : self._AutoGenObject.Macros["PLATFORM_DIR"],\r
\r
"module_name" : self._AutoGenObject.Name,\r
"module_guid" : self._AutoGenObject.Guid,\r
+ "module_name_guid" : self._AutoGenObject._GetUniqueBaseName(),\r
"module_version" : self._AutoGenObject.Version,\r
"module_type" : self._AutoGenObject.ModuleType,\r
"module_file" : self._AutoGenObject.MetaFile,\r
"module_file_base_name" : self._AutoGenObject.MetaFile.BaseName,\r
"module_relative_directory" : self._AutoGenObject.SourceDir,\r
+ "module_dir" : mws.join (self._AutoGenObject.WorkspaceDir, self._AutoGenObject.SourceDir),\r
\r
"architecture" : self._AutoGenObject.Arch,\r
"toolchain_tag" : self._AutoGenObject.ToolChain,\r
PLATFORM_GUID = ${platform_guid}\r
PLATFORM_VERSION = ${platform_version}\r
PLATFORM_FILE = ${platform_file}\r
-PLATFORM_DIR = $(WORKSPACE)${separator}${platform_relative_directory}\r
+PLATFORM_DIR = ${platform_dir}\r
PLATFORM_OUTPUT_DIR = ${platform_output_directory}\r
\r
#\r
self.IntermediateDirectoryList = []\r
self.ModuleBuildDirectoryList = []\r
self.LibraryBuildDirectoryList = []\r
+ self.LibraryMakeCommandList = []\r
\r
# Compose a dict object containing information used to do replacement in template\r
def _CreateTemplateDict(self):\r
Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":Makefile}\r
LibraryMakefileList.append(Makefile)\r
LibraryMakeCommandList.append(Command)\r
+ self.LibraryMakeCommandList = LibraryMakeCommandList\r
\r
ModuleMakefileList = []\r
ModuleMakeCommandList = []\r
"platform_relative_directory": PlatformInfo.SourceDir,\r
"platform_output_directory" : PlatformInfo.OutputDir,\r
"platform_build_directory" : PlatformInfo.BuildDir,\r
+ "platform_dir" : self._AutoGenObject.Macros["PLATFORM_DIR"],\r
\r
"toolchain_tag" : PlatformInfo.ToolChain,\r
"build_target" : PlatformInfo.BuildTarget,\r
def GetModuleBuildDirectoryList(self):\r
DirList = []\r
for ModuleAutoGen in self._AutoGenObject.ModuleAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
+ if not ModuleAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
return DirList\r
\r
## Get the root directory list for intermediate files of all libraries build\r
def GetLibraryBuildDirectoryList(self):\r
DirList = []\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
+ if not LibraryAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
_TemplateDict = property(_CreateTemplateDict)\r
#\r
class TopLevelMakefile(BuildFile):\r
## template used to generate toplevel makefile\r
- _TEMPLATE_ = TemplateString('''\\r
-${makefile_header}\r
-\r
-#\r
-# Platform Macro Definition\r
-#\r
-PLATFORM_NAME = ${platform_name}\r
-PLATFORM_GUID = ${platform_guid}\r
-PLATFORM_VERSION = ${platform_version}\r
-\r
-#\r
-# Build Configuration Macro Definition\r
-#\r
-TOOLCHAIN = ${toolchain_tag}\r
-TOOLCHAIN_TAG = ${toolchain_tag}\r
-TARGET = ${build_target}\r
-\r
-#\r
-# Build Directory Macro Definition\r
-#\r
-BUILD_DIR = ${platform_build_directory}\r
-FV_DIR = ${platform_build_directory}${separator}FV\r
-\r
-#\r
-# Shell Command Macro\r
-#\r
-${BEGIN}${shell_command_code} = ${shell_command}\r
-${END}\r
-\r
-MAKE = ${make_path}\r
-MAKE_FILE = ${makefile_path}\r
-\r
-#\r
-# Default target\r
-#\r
-all: modules fds\r
-\r
-#\r
-# Initialization target: print build information and create necessary directories\r
-#\r
-init:\r
-\t-@\r
-\t${BEGIN}-@${create_directory_command}\r
-\t${END}\r
-#\r
-# library build target\r
-#\r
-libraries: init\r
-${BEGIN}\t@cd $(BUILD_DIR)${separator}${arch} && "$(MAKE)" $(MAKE_FLAGS) libraries\r
-${END}\t@cd $(BUILD_DIR)\r
-\r
-#\r
-# module build target\r
-#\r
-modules: init\r
-${BEGIN}\t@cd $(BUILD_DIR)${separator}${arch} && "$(MAKE)" $(MAKE_FLAGS) modules\r
-${END}\t@cd $(BUILD_DIR)\r
-\r
-#\r
-# Flash Device Image Target\r
-#\r
-fds: init\r
-\t-@cd $(FV_DIR)\r
-${BEGIN}\tGenFds -f ${fdf_file} -o $(BUILD_DIR) -t $(TOOLCHAIN) -b $(TARGET) -p ${active_platform} -a ${build_architecture_list} ${extra_options}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -C ${cap} ${END}${BEGIN} -D ${macro} ${END}\r
-\r
-#\r
-# run command for emulator platform only\r
-#\r
-run:\r
-\tcd $(BUILD_DIR)${separator}IA32 && ".${separator}SecMain"\r
-\tcd $(BUILD_DIR)\r
-\r
-#\r
-# Clean intermediate files\r
-#\r
-clean:\r
-${BEGIN}\t-@${sub_build_command} clean\r
-${END}\t@cd $(BUILD_DIR)\r
-\r
-#\r
-# Clean all generated files except to makefile\r
-#\r
-cleanall:\r
-${BEGIN}\t${cleanall_command}\r
-${END}\r
-\r
-#\r
-# Clean all library files\r
-#\r
-cleanlib:\r
-${BEGIN}\t-@${sub_build_command} cleanlib\r
-${END}\t@cd $(BUILD_DIR)\n\r
-''')\r
+ _TEMPLATE_ = TemplateString('''${BEGIN}\tGenFds -f ${fdf_file} --conf=${conf_directory} -o ${platform_build_directory} -t ${toolchain_tag} -b ${build_target} -p ${active_platform} -a ${build_architecture_list} ${extra_options}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -C ${cap} ${END}${BEGIN} -D ${macro} ${END}''')\r
\r
## Constructor of TopLevelMakefile\r
#\r
\r
# TRICK: for not generating GenFds call in makefile if no FDF file\r
MacroList = []\r
- if PlatformInfo.FdfFile != None and PlatformInfo.FdfFile != "":\r
+ if PlatformInfo.FdfFile is not None and PlatformInfo.FdfFile != "":\r
FdfFileList = [PlatformInfo.FdfFile]\r
# macros passed to GenFds\r
MacroList.append('"%s=%s"' % ("EFI_SOURCE", GlobalData.gEfiSource.replace('\\', '\\\\')))\r
\r
if GlobalData.gCaseInsensitive:\r
ExtraOption += " -c"\r
+ if GlobalData.gEnableGenfdsMultiThread:\r
+ ExtraOption += " --genfds-multi-thread"\r
+ if GlobalData.gIgnoreSource:\r
+ ExtraOption += " --ignore-sources"\r
+\r
+ for pcd in GlobalData.BuildOptionPcd:\r
+ if pcd[2]:\r
+ pcdname = '.'.join(pcd[0:3])\r
+ else:\r
+ pcdname = '.'.join(pcd[0:2])\r
+ if pcd[3].startswith('{'):\r
+ ExtraOption += " --pcd " + pcdname + '=' + 'H' + '"' + pcd[3] + '"'\r
+ else:\r
+ ExtraOption += " --pcd " + pcdname + '=' + pcd[3]\r
\r
MakefileName = self._FILE_NAME_[self._FileType]\r
SubBuildCommandList = []\r
"platform_guid" : PlatformInfo.Guid,\r
"platform_version" : PlatformInfo.Version,\r
"platform_build_directory" : PlatformInfo.BuildDir,\r
+ "conf_directory" : GlobalData.gConfDirectory,\r
\r
"toolchain_tag" : PlatformInfo.ToolChain,\r
"build_target" : PlatformInfo.BuildTarget,\r
def GetModuleBuildDirectoryList(self):\r
DirList = []\r
for ModuleAutoGen in self._AutoGenObject.ModuleAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
+ if not ModuleAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
return DirList\r
\r
## Get the root directory list for intermediate files of all libraries build\r
def GetLibraryBuildDirectoryList(self):\r
DirList = []\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
+ if not LibraryAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
_TemplateDict = property(_CreateTemplateDict)\r