\r
## Import Modules\r
#\r
+from __future__ import absolute_import\r
import Common.LongFilePathOs as os\r
import sys\r
import string\r
from Common.DataType import TAB_COMPILER_MSFT\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
"gmake" : "include"\r
}\r
\r
- _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "RVCT" : "-I"}\r
+ _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "RVCT" : "-I", "NASM" : "-I"}\r
\r
## Constructor of BuildFile\r
#\r
else:\r
ModuleEntryPoint = "_ModuleEntryPoint"\r
\r
- # Intel EBC compiler enforces EfiMain\r
- if MyAgo.AutoGenVersion < 0x00010005 and MyAgo.Arch == "EBC":\r
- ArchEntryPoint = "EfiMain"\r
- else:\r
- ArchEntryPoint = ModuleEntryPoint\r
+ ArchEntryPoint = ModuleEntryPoint\r
\r
if MyAgo.Arch == "EBC":\r
# EBC compiler always use "EfiStart" as entry point. Only applies to EdkII modules\r
ImageEntryPoint = "EfiStart"\r
- elif MyAgo.AutoGenVersion < 0x00010005:\r
- # Edk modules use entry point specified in INF file\r
- ImageEntryPoint = ModuleEntryPoint\r
else:\r
# EdkII modules always use "_ModuleEntryPoint" as entry point\r
ImageEntryPoint = "_ModuleEntryPoint"\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
+ RespFileListContent += '@' + RespFile + TAB_LINE_BREAK\r
+ RespFileListContent += NewRespStr + TAB_LINE_BREAK\r
SaveFileOnChange(RespFileList, RespFileListContent, False)\r
else:\r
if os.path.exists(RespFileList):\r
}\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
+ 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
+ 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
- # Edk modules need <BaseName>StrDefs.h for string ID\r
- #if MyAgo.AutoGenVersion < 0x00010005 and len(MyAgo.UnicodeFileList) > 0:\r
- # BcTargetList = ['strdefs']\r
- #else:\r
- # BcTargetList = []\r
BcTargetList = []\r
\r
MakefileName = self._FILE_NAME_[self._FileType]\r
"separator" : Separator,\r
"module_tool_definitions" : ToolsDef,\r
\r
- "shell_command_code" : self._SHELL_CMD_[self._FileType].keys(),\r
- "shell_command" : self._SHELL_CMD_[self._FileType].values(),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
\r
"module_entry_point" : ModuleEntryPoint,\r
"image_entry_point" : ImageEntryPoint,\r
NewFile = self.PlaceMacro(str(F), self.Macros)\r
# In order to use file list macro as dependency\r
if T.GenListFile:\r
- # gnu tools need forward slash path separater, even on Windows\r
+ # gnu tools need forward slash path separator, even on Windows\r
self.ListFileMacros[T.ListFileMacro].append(str(F).replace ('\\', '/'))\r
self.FileListMacros[T.FileListMacro].append(NewFile)\r
elif T.GenFileListMacro:\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 dependecies will be only searched\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
CurrentFileDependencyList = DepDb[F]\r
else:\r
try:\r
- Fd = open(F.Path, 'r')\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
-\r
- FileContent = Fd.read()\r
- Fd.close()\r
if len(FileContent) == 0:\r
continue\r
\r
if FileContent[0] == 0xff or FileContent[0] == 0xfe:\r
- FileContent = unicode(FileContent, "utf-16")\r
+ FileContent = FileContent.decode('utf-16')\r
+ else:\r
+ try:\r
+ FileContent = str(FileContent)\r
+ except:\r
+ pass\r
IncludedFileList = gIncludePattern.findall(FileContent)\r
\r
for Inc in IncludedFileList:\r
"separator" : Separator,\r
"module_tool_definitions" : ToolsDef,\r
\r
- "shell_command_code" : self._SHELL_CMD_[self._FileType].keys(),\r
- "shell_command" : self._SHELL_CMD_[self._FileType].values(),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
\r
"create_directory_command" : self.GetCreateDirectoryCommand(self.IntermediateDirectoryList),\r
"custom_makefile_content" : CustomMakefile\r
\r
"toolchain_tag" : MyAgo.ToolChain,\r
"build_target" : MyAgo.BuildTarget,\r
- "shell_command_code" : self._SHELL_CMD_[self._FileType].keys(),\r
- "shell_command" : self._SHELL_CMD_[self._FileType].values(),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
"build_architecture_list" : MyAgo.Arch,\r
"architecture" : MyAgo.Arch,\r
"separator" : Separator,\r
if MyAgo.FdfFile is not None and MyAgo.FdfFile != "":\r
FdfFileList = [MyAgo.FdfFile]\r
# macros passed to GenFds\r
- MacroList.append('"%s=%s"' % ("EFI_SOURCE", GlobalData.gEfiSource.replace('\\', '\\\\')))\r
- MacroList.append('"%s=%s"' % ("EDK_SOURCE", GlobalData.gEdkSource.replace('\\', '\\\\')))\r
MacroDict = {}\r
MacroDict.update(GlobalData.gGlobalDefines)\r
MacroDict.update(GlobalData.gCommandLineDefines)\r
- MacroDict.pop("EFI_SOURCE", "dummy")\r
- MacroDict.pop("EDK_SOURCE", "dummy")\r
for MacroName in MacroDict:\r
if MacroDict[MacroName] != "":\r
MacroList.append('"%s=%s"' % (MacroName, MacroDict[MacroName].replace('\\', '\\\\')))\r
\r
"toolchain_tag" : MyAgo.ToolChain,\r
"build_target" : MyAgo.BuildTarget,\r
- "shell_command_code" : self._SHELL_CMD_[self._FileType].keys(),\r
- "shell_command" : self._SHELL_CMD_[self._FileType].values(),\r
+ "shell_command_code" : list(self._SHELL_CMD_[self._FileType].keys()),\r
+ "shell_command" : list(self._SHELL_CMD_[self._FileType].values()),\r
'arch' : list(MyAgo.ArchList),\r
"build_architecture_list" : ','.join(MyAgo.ArchList),\r
"separator" : Separator,\r
projects / mirror_edk2.git / blobdiff