## @file\r
# build a platform or a module\r
#\r
-# Copyright (c) 2007 - 2010, Intel Corporation\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
#\r
-# All rights reserved. This program and the accompanying materials\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
# http://opensource.org/licenses/bsd-license.php\r
##\r
# Import Modules\r
#\r
-import os\r
+import Common.LongFilePathOs as os\r
import re\r
import StringIO\r
import sys\r
import time\r
import platform\r
import traceback\r
+import encodings.ascii\r
\r
from struct import *\r
from threading import *\r
from subprocess import *\r
from Common import Misc as Utils\r
\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.LongFilePathSupport import LongFilePath\r
from Common.TargetTxtClassObject import *\r
from Common.ToolDefClassObject import *\r
from Common.DataType import *\r
+from Common.BuildVersion import gBUILD_VERSION\r
from AutoGen.AutoGen import *\r
from Common.BuildToolError import *\r
from Workspace.WorkspaceDatabase import *\r
import Common.GlobalData as GlobalData\r
\r
# Version and Copyright\r
-VersionNumber = "0.5"\r
+VersionNumber = "0.51" + ' ' + gBUILD_VERSION\r
__version__ = "%prog Version " + VersionNumber\r
-__copyright__ = "Copyright (c) 2007 - 2010, Intel Corporation All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2014, Intel Corporation All rights reserved."\r
\r
## standard targets of build command\r
gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']\r
gBuildCacheDir = "Conf/.cache"\r
gToolsDefinition = "Conf/tools_def.txt"\r
\r
+TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')\r
+TmpTableDict = {}\r
+\r
## Check environment PATH variable to make sure the specified tool is found\r
#\r
# If the tool is found in the PATH, then True is returned\r
os.environ["WORKSPACE"] = WorkspaceDir\r
\r
#\r
- # Check EFI_SOURCE (R8 build convention). EDK_SOURCE will always point to ECP\r
+ # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP\r
#\r
- os.environ["ECP_SOURCE"] = os.path.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)\r
+ if "ECP_SOURCE" not in os.environ:\r
+ os.environ["ECP_SOURCE"] = os.path.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)\r
if "EFI_SOURCE" not in os.environ:\r
os.environ["EFI_SOURCE"] = os.environ["ECP_SOURCE"]\r
if "EDK_SOURCE" not in os.environ:\r
EfiSourceDir = os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"]))\r
EdkSourceDir = os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"]))\r
EcpSourceDir = os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"]))\r
- \r
+\r
os.environ["EFI_SOURCE"] = EfiSourceDir\r
os.environ["EDK_SOURCE"] = EdkSourceDir\r
os.environ["ECP_SOURCE"] = EcpSourceDir\r
os.environ["EDK_TOOLS_PATH"] = os.path.normcase(os.environ["EDK_TOOLS_PATH"])\r
- \r
+\r
if not os.path.exists(EcpSourceDir):\r
- EdkLogger.verbose("ECP_SOURCE = %s doesn't exist. R8 modules could not be built." % EcpSourceDir)\r
+ EdkLogger.verbose("ECP_SOURCE = %s doesn't exist. Edk modules could not be built." % EcpSourceDir)\r
elif ' ' in EcpSourceDir:\r
EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in ECP_SOURCE path",\r
ExtraData=EcpSourceDir)\r
if not os.path.exists(EdkSourceDir):\r
if EdkSourceDir == EcpSourceDir:\r
- EdkLogger.verbose("EDK_SOURCE = %s doesn't exist. R8 modules could not be built." % EdkSourceDir)\r
+ EdkLogger.verbose("EDK_SOURCE = %s doesn't exist. Edk modules could not be built." % EdkSourceDir)\r
else:\r
EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE does not exist",\r
ExtraData=EdkSourceDir)\r
ExtraData=EdkSourceDir)\r
if not os.path.exists(EfiSourceDir):\r
if EfiSourceDir == EcpSourceDir:\r
- EdkLogger.verbose("EFI_SOURCE = %s doesn't exist. R8 modules could not be built." % EfiSourceDir)\r
+ EdkLogger.verbose("EFI_SOURCE = %s doesn't exist. Edk modules could not be built." % EfiSourceDir)\r
else:\r
EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE does not exist",\r
ExtraData=EfiSourceDir)\r
GlobalData.gEdkSource = EdkSourceDir\r
GlobalData.gEcpSource = EcpSourceDir\r
\r
+ GlobalData.gGlobalDefines["WORKSPACE"] = WorkspaceDir\r
+ GlobalData.gGlobalDefines["EFI_SOURCE"] = EfiSourceDir\r
+ GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir\r
+ GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir\r
+ GlobalData.gGlobalDefines["EDK_TOOLS_PATH"] = os.environ["EDK_TOOLS_PATH"]\r
+\r
## Get normalized file path\r
#\r
# Convert the path to be local format, and remove the WORKSPACE path at the\r
self.WorkingDir = WorkingDir\r
self.Target = Target\r
self.BuildCommand = BuildCommand\r
- if BuildCommand == None or len(BuildCommand) == 0:\r
- EdkLogger.error("build", OPTION_MISSING, "No build command found for",\r
+ if not BuildCommand:\r
+ EdkLogger.error("build", OPTION_MISSING,\r
+ "No build command found for this module. "\r
+ "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." %\r
+ (Obj.BuildTarget, Obj.ToolChain, Obj.Arch),\r
ExtraData=str(Obj))\r
\r
+\r
## str() method\r
#\r
- # It just returns the string representaion of self.BuildObject\r
+ # It just returns the string representation of self.BuildObject\r
#\r
# @param self The object pointer\r
#\r
#\r
# Constructor will load all required image information.\r
#\r
- # @param BaseName The full file path of image. \r
+ # @param BaseName The full file path of image.\r
# @param Guid The GUID for image.\r
# @param Arch Arch of this image.\r
- # @param OutpuDir The output directory for image.\r
+ # @param OutputDir The output directory for image.\r
+ # @param DebugDir The debug directory for image.\r
# @param ImageClass PeImage Information\r
#\r
- def __init__(self, BaseName, Guid, Arch, OutpuDir, ImageClass):\r
+ def __init__(self, BaseName, Guid, Arch, OutputDir, DebugDir, ImageClass):\r
self.BaseName = BaseName\r
self.Guid = Guid\r
self.Arch = Arch\r
- self.OutpuDir = OutpuDir\r
+ self.OutputDir = OutputDir\r
+ self.DebugDir = DebugDir\r
self.Image = ImageClass\r
self.Image.Size = (self.Image.Size / 0x1000 + 1) * 0x1000\r
\r
#\r
# @param Target The build command target, one of gSupportedTarget\r
# @param WorkspaceDir The directory of workspace\r
- # @param Platform The DSC file of active platform\r
- # @param Module The INF file of active module, if any\r
- # @param Arch The Arch list of platform or module\r
- # @param ToolChain The name list of toolchain\r
- # @param BuildTarget The "DEBUG" or "RELEASE" build\r
- # @param FlashDefinition The FDF file of active platform\r
- # @param FdList=[] The FD names to be individually built\r
- # @param FvList=[] The FV names to be individually built\r
- # @param MakefileType The type of makefile (for MSFT make or GNU make)\r
- # @param SilentMode Indicate multi-thread build mode\r
- # @param ThreadNumber The maximum number of thread if in multi-thread build mode\r
- # @param SkipAutoGen Skip AutoGen step\r
- # @param Reparse Re-parse all meta files\r
- # @param SkuId SKU id from command line\r
- #\r
- def __init__(self, Target, WorkspaceDir, Platform, Module, Arch, ToolChain,\r
- BuildTarget, FlashDefinition, FdList=[], FvList=[],\r
- MakefileType="nmake", SilentMode=False, ThreadNumber=2,\r
- SkipAutoGen=False, Reparse=False, SkuId=None, \r
- ReportFile=None, ReportType=None):\r
-\r
- self.WorkspaceDir = WorkspaceDir\r
+ # @param BuildOptions Build options passed from command line\r
+ #\r
+ def __init__(self, Target, WorkspaceDir, BuildOptions):\r
+ self.WorkspaceDir = WorkspaceDir\r
self.Target = Target\r
- self.PlatformFile = Platform\r
- self.ModuleFile = Module\r
- self.ArchList = Arch\r
- self.ToolChainList = ToolChain\r
- self.BuildTargetList= BuildTarget\r
- self.Fdf = FlashDefinition\r
- self.FdList = FdList\r
- self.FvList = FvList\r
- self.MakefileType = MakefileType\r
- self.SilentMode = SilentMode\r
- self.ThreadNumber = ThreadNumber\r
- self.SkipAutoGen = SkipAutoGen\r
- self.Reparse = Reparse\r
- self.SkuId = SkuId\r
+ self.PlatformFile = BuildOptions.PlatformFile\r
+ self.ModuleFile = BuildOptions.ModuleFile\r
+ self.ArchList = BuildOptions.TargetArch\r
+ self.ToolChainList = BuildOptions.ToolChain\r
+ self.BuildTargetList= BuildOptions.BuildTarget\r
+ self.Fdf = BuildOptions.FdfFile\r
+ self.FdList = BuildOptions.RomImage\r
+ self.FvList = BuildOptions.FvImage\r
+ self.CapList = BuildOptions.CapName\r
+ self.SilentMode = BuildOptions.SilentMode\r
+ self.ThreadNumber = BuildOptions.ThreadNumber\r
+ self.SkipAutoGen = BuildOptions.SkipAutoGen\r
+ self.Reparse = BuildOptions.Reparse\r
+ self.SkuId = BuildOptions.SkuId\r
self.SpawnMode = True\r
- self.BuildReport = BuildReport(ReportFile, ReportType)\r
+ self.BuildReport = BuildReport(BuildOptions.ReportFile, BuildOptions.ReportType)\r
self.TargetTxt = TargetTxtClassObject()\r
self.ToolDef = ToolDefClassObject()\r
- self.Db = WorkspaceDatabase(None, GlobalData.gGlobalDefines, self.Reparse)\r
- #self.Db = WorkspaceDatabase(None, {}, self.Reparse)\r
+ if BuildOptions.DisableCache:\r
+ self.Db = WorkspaceDatabase(":memory:")\r
+ else:\r
+ self.Db = WorkspaceDatabase(None, self.Reparse)\r
self.BuildDatabase = self.Db.BuildObject\r
self.Platform = None\r
self.LoadFixAddress = 0\r
+ self.UniFlag = BuildOptions.Flag\r
\r
- # print dot charater during doing some time-consuming work\r
+ # print dot character during doing some time-consuming work\r
self.Progress = Utils.Progressor()\r
\r
- # parse target.txt, tools_def.txt, and platform file\r
- #self.RestoreBuildData()\r
- self.LoadConfiguration()\r
self.InitBuild()\r
\r
# print current build environment and configuration\r
- EdkLogger.quiet("%-24s = %s" % ("WORKSPACE", os.environ["WORKSPACE"]))\r
- EdkLogger.quiet("%-24s = %s" % ("ECP_SOURCE", os.environ["ECP_SOURCE"]))\r
- EdkLogger.quiet("%-24s = %s" % ("EDK_SOURCE", os.environ["EDK_SOURCE"]))\r
- EdkLogger.quiet("%-24s = %s" % ("EFI_SOURCE", os.environ["EFI_SOURCE"]))\r
- EdkLogger.quiet("%-24s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))\r
-\r
- EdkLogger.info('\n%-24s = %s' % ("TARGET_ARCH", ' '.join(self.ArchList)))\r
- EdkLogger.info('%-24s = %s' % ("TARGET", ' '.join(self.BuildTargetList)))\r
- EdkLogger.info('%-24s = %s' % ("TOOL_CHAIN_TAG", ' '.join(self.ToolChainList)))\r
-\r
- EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.PlatformFile))\r
-\r
- if self.Fdf != None and self.Fdf != "":\r
- EdkLogger.info('%-24s = %s' % ("Flash Image Definition", self.Fdf))\r
+ EdkLogger.quiet("%-16s = %s" % ("WORKSPACE", os.environ["WORKSPACE"]))\r
+ EdkLogger.quiet("%-16s = %s" % ("ECP_SOURCE", os.environ["ECP_SOURCE"]))\r
+ EdkLogger.quiet("%-16s = %s" % ("EDK_SOURCE", os.environ["EDK_SOURCE"]))\r
+ EdkLogger.quiet("%-16s = %s" % ("EFI_SOURCE", os.environ["EFI_SOURCE"]))\r
+ EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))\r
\r
- if self.ModuleFile != None and self.ModuleFile != "":\r
- EdkLogger.info('%-24s = %s' % ("Active Module", self.ModuleFile))\r
+ EdkLogger.info("")\r
\r
os.chdir(self.WorkspaceDir)\r
- self.Progress.Start("\nProcessing meta-data")\r
\r
## Load configuration\r
#\r
EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=BuildConfigurationFile)\r
\r
# if no ARCH given in command line, get it from target.txt\r
- if self.ArchList == None or len(self.ArchList) == 0:\r
+ if not self.ArchList:\r
self.ArchList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET_ARCH]\r
+ self.ArchList = tuple(self.ArchList)\r
\r
# if no build target given in command line, get it from target.txt\r
- if self.BuildTargetList == None or len(self.BuildTargetList) == 0:\r
+ if not self.BuildTargetList:\r
self.BuildTargetList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]\r
\r
# if no tool chain given in command line, get it from target.txt\r
- if self.ToolChainList == None or len(self.ToolChainList) == 0:\r
+ if not self.ToolChainList:\r
self.ToolChainList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_TAG]\r
if self.ToolChainList == None or len(self.ToolChainList) == 0:\r
EdkLogger.error("build", RESOURCE_NOT_AVAILABLE, ExtraData="No toolchain given. Don't know how to build.\n")\r
ExtraData="No active platform specified in target.txt or command line! Nothing can be built.\n")\r
\r
self.PlatformFile = PathClass(NormFile(PlatformFile, self.WorkspaceDir), self.WorkspaceDir)\r
- ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False)\r
- if ErrorCode != 0:\r
- EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
## Initialize build configuration\r
#\r
# command line and target.txt, then get the final build configurations.\r
#\r
def InitBuild(self):\r
- ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc")\r
+ # parse target.txt, tools_def.txt, and platform file\r
+ self.LoadConfiguration()\r
+\r
+ # Allow case-insensitive for those from command line or configuration file\r
+ ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False)\r
if ErrorCode != 0:\r
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
# create metafile database\r
self.Db.InitDatabase()\r
\r
- # we need information in platform description file to determine how to build\r
- self.Platform = self.BuildDatabase[self.PlatformFile, 'COMMON']\r
- if not self.Fdf:\r
- self.Fdf = self.Platform.FlashDefinition\r
- \r
- LoadFixAddressString = None\r
- if TAB_FIX_LOAD_TOP_MEMORY_ADDRESS in GlobalData.gGlobalDefines:\r
- LoadFixAddressString = GlobalData.gGlobalDefines[TAB_FIX_LOAD_TOP_MEMORY_ADDRESS]\r
- else:\r
- LoadFixAddressString = self.Platform.LoadFixAddress\r
-\r
- if LoadFixAddressString != None and LoadFixAddressString != '':\r
- try:\r
- if LoadFixAddressString.upper().startswith('0X'):\r
- self.LoadFixAddress = int (LoadFixAddressString, 16)\r
- else:\r
- self.LoadFixAddress = int (LoadFixAddressString)\r
- except:
- EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS %s is not valid dec or hex string" % (LoadFixAddressString))\r
- if self.LoadFixAddress < 0:\r
- EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid negative value %s" % (LoadFixAddressString))\r
- if self.LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self.LoadFixAddress % 0x1000 != 0:\r
- EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid unaligned 4K value %s" % (LoadFixAddressString))\r
-\r
- if self.SkuId == None or self.SkuId == '':\r
- self.SkuId = self.Platform.SkuName\r
-\r
- # check FD/FV build target\r
- if self.Fdf == None or self.Fdf == "":\r
- if self.FdList != []:\r
- EdkLogger.info("No flash definition file found. FD [%s] will be ignored." % " ".join(self.FdList))\r
- self.FdList = []\r
- if self.FvList != []:\r
- EdkLogger.info("No flash definition file found. FV [%s] will be ignored." % " ".join(self.FvList))\r
- self.FvList = []\r
- else:\r
- FdfParserObj = FdfParser(str(self.Fdf))\r
- FdfParserObj.ParseFile()\r
- for fvname in self.FvList:\r
- if fvname.upper() not in FdfParserObj.Profile.FvDict.keys():\r
- EdkLogger.error("build", OPTION_VALUE_INVALID,\r
- "No such an FV in FDF file: %s" % fvname)\r
-\r
- #\r
- # Merge Arch\r
- #\r
- if self.ArchList == None or len(self.ArchList) == 0:\r
- ArchList = set(self.Platform.SupArchList)\r
- else:\r
- ArchList = set(self.ArchList) & set(self.Platform.SupArchList)\r
- if len(ArchList) == 0:\r
- EdkLogger.error("build", PARAMETER_INVALID,\r
- ExtraData = "Active platform supports [%s] only, but [%s] is given."\r
- % (" ".join(self.Platform.SupArchList), " ".join(self.ArchList)))\r
- elif len(ArchList) != len(self.ArchList):\r
- SkippedArchList = set(self.ArchList).symmetric_difference(set(self.Platform.SupArchList))\r
- EdkLogger.verbose("\nArch [%s] is ignored because active platform supports [%s] but [%s] is specified !"\r
- % (" ".join(SkippedArchList), " ".join(self.Platform.SupArchList), " ".join(self.ArchList)))\r
- self.ArchList = tuple(ArchList)\r
-\r
- # Merge build target\r
- if self.BuildTargetList == None or len(self.BuildTargetList) == 0:\r
- BuildTargetList = self.Platform.BuildTargets\r
- else:\r
- BuildTargetList = list(set(self.BuildTargetList) & set(self.Platform.BuildTargets))\r
- if BuildTargetList == []:\r
- EdkLogger.error("build", PARAMETER_INVALID, "Active platform only supports [%s], but [%s] is given"\r
- % (" ".join(self.Platform.BuildTargets), " ".join(self.BuildTargetList)))\r
- self.BuildTargetList = BuildTargetList\r
-\r
## Build a module or platform\r
#\r
- # Create autogen code and makfile for a module or platform, and the launch\r
+ # Create autogen code and makefile for a module or platform, and the launch\r
# "make" command to build it\r
#\r
# @param Target The target of build command\r
if not self.SkipAutoGen or Target == 'genmake':\r
self.Progress.Start("Generating makefile")\r
AutoGenObject.CreateMakeFile(CreateDepsMakeFile)\r
+ AutoGenObject.CreateAsBuiltInf()\r
self.Progress.Stop("done!")\r
if Target == "genmake":\r
return True\r
\r
BuildCommand = AutoGenObject.BuildCommand\r
if BuildCommand == None or len(BuildCommand) == 0:\r
- EdkLogger.error("build", OPTION_MISSING, ExtraData="No MAKE command found for [%s, %s, %s]" % Key)\r
+ EdkLogger.error("build", OPTION_MISSING,\r
+ "No build command found for this module. "\r
+ "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." %\r
+ (AutoGenObject.BuildTarget, AutoGenObject.ToolChain, AutoGenObject.Arch),\r
+ ExtraData=str(AutoGenObject))\r
\r
BuildCommand = BuildCommand + [Target]\r
LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
try:\r
#os.rmdir(AutoGenObject.BuildDir)\r
RemoveDirectory(AutoGenObject.BuildDir, True)\r
+ #\r
+ # First should close DB.\r
+ #\r
+ self.Db.Close()\r
+ RemoveDirectory(gBuildCacheDir, True)\r
except WindowsError, X:\r
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
return True\r
\r
- ## Rebase module image and Get function address for the inpug module list.\r
+ ## Rebase module image and Get function address for the input module list.\r
#\r
def _RebaseModule (self, MapBuffer, BaseAddress, ModuleList, AddrIsOffset = True, ModeIsSmm = False):\r
if ModeIsSmm:\r
InfFileNameList = ModuleList.keys()\r
#InfFileNameList.sort()\r
for InfFile in InfFileNameList:\r
- sys.stdout.write (".")
- sys.stdout.flush()
+ sys.stdout.write (".")\r
+ sys.stdout.flush()\r
ModuleInfo = ModuleList[InfFile]\r
ModuleName = ModuleInfo.BaseName\r
+ ModuleOutputImage = ModuleInfo.Image.FileName\r
+ ModuleDebugImage = os.path.join(ModuleInfo.DebugDir, ModuleInfo.BaseName + '.efi')\r
## for SMM module in SMRAM, the SMRAM will be allocated from base to top.\r
if not ModeIsSmm:\r
BaseAddress = BaseAddress - ModuleInfo.Image.Size\r
#\r
# Update Image to new BaseAddress by GenFw tool\r
#\r
- LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleInfo.Image.FileName], ModuleInfo.OutpuDir)\r
+ LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)\r
+ LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)\r
else:\r
#\r
# Set new address to the section header only for SMM driver.\r
#\r
- LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleInfo.Image.FileName], ModuleInfo.OutpuDir)\r
+ LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)\r
+ LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)\r
#\r
# Collect funtion address from Map file\r
#\r
- ImageMapTable = ModuleInfo.Image.FileName.replace('.efi', '.map')\r
+ ImageMapTable = ModuleOutputImage.replace('.efi', '.map')\r
FunctionList = []\r
if os.path.exists(ImageMapTable):\r
OrigImageBaseAddress = 0\r
elif SectionHeader[0] in ['.data', '.sdata']:\r
DataSectionAddress = SectionHeader[1]\r
if AddrIsOffset:\r
- MapBuffer.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress))) \r
+ MapBuffer.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress)))\r
else:\r
- MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress)) \r
+ MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress))\r
+ #\r
+ # Add debug image full path.\r
+ #\r
+ MapBuffer.write('(IMAGE=%s)\n\n' % (ModuleDebugImage))\r
#\r
# Add funtion address\r
#\r
\r
## Collect MAP information of all FVs\r
#\r
- def _CollectFvMapBuffer (self, MapBuffer, Wa):\r
- if self.Fdf != '':\r
+ def _CollectFvMapBuffer (self, MapBuffer, Wa, ModuleList):\r
+ if self.Fdf:\r
# First get the XIP base address for FV map file.\r
+ GuidPattern = re.compile("[-a-fA-F0-9]+")\r
+ GuidName = re.compile("\(GUID=[-a-fA-F0-9]+")\r
for FvName in Wa.FdfProfile.FvDict.keys():\r
FvMapBuffer = os.path.join(Wa.FvDir, FvName + '.Fv.map')\r
if not os.path.exists(FvMapBuffer):\r
continue\r
- FvMap = open (FvMapBuffer, 'r')\r
+ FvMap = open(FvMapBuffer, 'r')\r
#skip FV size information\r
FvMap.readline()\r
FvMap.readline()\r
FvMap.readline()\r
FvMap.readline()\r
- MapBuffer.write(FvMap.read())\r
+ for Line in FvMap:\r
+ MatchGuid = GuidPattern.match(Line)\r
+ if MatchGuid != None:\r
+ #\r
+ # Replace GUID with module name\r
+ #\r
+ GuidString = MatchGuid.group()\r
+ if GuidString.upper() in ModuleList:\r
+ Line = Line.replace(GuidString, ModuleList[GuidString.upper()].Name)\r
+ MapBuffer.write('%s' % (Line))\r
+ #\r
+ # Add the debug image full path.\r
+ #\r
+ MatchGuid = GuidName.match(Line)\r
+ if MatchGuid != None:\r
+ GuidString = MatchGuid.group().split("=")[1]\r
+ if GuidString.upper() in ModuleList:\r
+ MapBuffer.write('(IMAGE=%s)\n' % (os.path.join(ModuleList[GuidString.upper()].DebugDir, ModuleList[GuidString.upper()].Name + '.efi')))\r
+\r
FvMap.close()\r
\r
## Collect MAP information of all modules\r
#\r
def _CollectModuleMapBuffer (self, MapBuffer, ModuleList):\r
- sys.stdout.write ("Generate Load Module At Fix Address Map")
- sys.stdout.flush()
+ sys.stdout.write ("Generate Load Module At Fix Address Map")\r
+ sys.stdout.flush()\r
PatchEfiImageList = []\r
PeiModuleList = {}\r
BtModuleList = {}\r
IsIpfPlatform = False\r
if 'IPF' in self.ArchList:\r
IsIpfPlatform = True\r
- for Module in ModuleList:\r
+ for ModuleGuid in ModuleList:\r
+ Module = ModuleList[ModuleGuid]\r
GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (Module.MetaFile, Module.Arch, Module.ToolChain, Module.BuildTarget)\r
- \r
+\r
OutputImageFile = ''\r
for ResultFile in Module.CodaTargetList:\r
if str(ResultFile.Target).endswith('.efi'):\r
ImageClass = PeImageClass (OutputImageFile)\r
if not ImageClass.IsValid:\r
EdkLogger.error("build", FILE_PARSE_FAILURE, ExtraData=ImageClass.ErrorInfo)\r
- ImageInfo = PeImageInfo(Module.Name, Module.Guid, Module.Arch, Module.OutputDir, ImageClass)\r
+ ImageInfo = PeImageInfo(Module.Name, Module.Guid, Module.Arch, Module.OutputDir, Module.DebugDir, ImageClass)\r
if Module.ModuleType in ['PEI_CORE', 'PEIM', 'COMBINED_PEIM_DRIVER','PIC_PEIM', 'RELOCATABLE_PEIM', 'DXE_CORE']:\r
PeiModuleList[Module.MetaFile] = ImageInfo\r
PeiSize += ImageInfo.Image.Size\r
SmmModuleList[Module.MetaFile] = ImageInfo\r
SmmSize += ImageInfo.Image.Size\r
if Module.ModuleType == 'DXE_SMM_DRIVER':\r
- PiSpecVersion = 0
- if 'PI_SPECIFICATION_VERSION' in Module.Module.Specification:
- PiSpecVersion = Module.Module.Specification['PI_SPECIFICATION_VERSION']
+ PiSpecVersion = '0x00000000'\r
+ if 'PI_SPECIFICATION_VERSION' in Module.Module.Specification:\r
+ PiSpecVersion = Module.Module.Specification['PI_SPECIFICATION_VERSION']\r
# for PI specification < PI1.1, DXE_SMM_DRIVER also runs as BOOT time driver.\r
- if PiSpecVersion < 0x0001000A:\r
+ if int(PiSpecVersion, 16) < 0x0001000A:\r
BtModuleList[Module.MetaFile] = ImageInfo\r
BtSize += ImageInfo.Image.Size\r
break\r
if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_LIST:\r
ModuleIsPatch = True\r
break\r
- \r
+\r
if not ModuleIsPatch:\r
continue\r
#\r
# Module includes the patchable load fix address PCDs.\r
- # It will be fixed up later. \r
+ # It will be fixed up later.\r
#\r
PatchEfiImageList.append (OutputImageFile)\r
- \r
+\r
#\r
# Get Top Memory address\r
#\r
#\r
# Patch FixAddress related PCDs into EFI image\r
#\r
- for EfiImage in PatchEfiImageList: \r
+ for EfiImage in PatchEfiImageList:\r
EfiImageMap = EfiImage.replace('.efi', '.map')\r
if not os.path.exists(EfiImageMap):\r
continue\r
#\r
# Get PCD offset in EFI image by GenPatchPcdTable function\r
#\r
- PcdTable = parsePcdInfoFromMapFile(EfiImageMap, EfiImage)
+ PcdTable = parsePcdInfoFromMapFile(EfiImageMap, EfiImage)\r
#\r
# Patch real PCD value by PatchPcdValue tool\r
#\r
ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE_DATA_TYPE, str (SmmSize/0x1000))\r
if ReturnValue != 0:\r
EdkLogger.error("build", PARAMETER_INVALID, "Patch PCD value failed", ExtraData=ErrorInfo)\r
- \r
+\r
MapBuffer.write('PEI_CODE_PAGE_NUMBER = 0x%x\n' % (PeiSize/0x1000))\r
MapBuffer.write('BOOT_CODE_PAGE_NUMBER = 0x%x\n' % (BtSize/0x1000))\r
MapBuffer.write('RUNTIME_CODE_PAGE_NUMBER = 0x%x\n' % (RtSize/0x1000))\r
if len (SmmModuleList) > 0:\r
MapBuffer.write('SMM_CODE_PAGE_NUMBER = 0x%x\n' % (SmmSize/0x1000))\r
- \r
+\r
PeiBaseAddr = TopMemoryAddress - RtSize - BtSize\r
BtBaseAddr = TopMemoryAddress - RtSize\r
RtBaseAddr = TopMemoryAddress - ReservedRuntimeMemorySize\r
self._RebaseModule (MapBuffer, RtBaseAddr, RtModuleList, TopMemoryAddress == 0)\r
self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset = False, ModeIsSmm = True)\r
MapBuffer.write('\n\n')\r
- sys.stdout.write ("\n")
- sys.stdout.flush()
- \r
+ sys.stdout.write ("\n")\r
+ sys.stdout.flush()\r
+\r
## Save platform Map file\r
#\r
def _SaveMapFile (self, MapBuffer, Wa):\r
#\r
SaveFileOnChange(MapFilePath, MapBuffer.getvalue(), False)\r
MapBuffer.close()\r
- sys.stdout.write ("\nLoad Module At Fix Address Map file saved to %s\n" %(MapFilePath))
- sys.stdout.flush()
+ if self.LoadFixAddress != 0:\r
+ sys.stdout.write ("\nLoad Module At Fix Address Map file can be found at %s\n" %(MapFilePath))\r
+ sys.stdout.flush()\r
\r
## Build active platform for different build targets and different tool chains\r
#\r
def _BuildPlatform(self):\r
for BuildTarget in self.BuildTargetList:\r
+ GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
for ToolChain in self.ToolChainList:\r
+ GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
+ GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
Wa = WorkspaceAutoGen(\r
self.WorkspaceDir,\r
- self.Platform,\r
+ self.PlatformFile,\r
BuildTarget,\r
ToolChain,\r
self.ArchList,\r
self.Fdf,\r
self.FdList,\r
self.FvList,\r
- self.SkuId\r
+ self.CapList,\r
+ self.SkuId,\r
+ self.UniFlag,\r
+ self.Progress\r
)\r
+ self.Fdf = Wa.FdfFile\r
+ self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
self.BuildReport.AddPlatformReport(Wa)\r
self.Progress.Stop("done!")\r
self._Build(self.Target, Wa)\r
- \r
+\r
# Create MAP file when Load Fix Address is enabled.\r
- if self.Target in ["", "all", "fds"] and self.LoadFixAddress != 0:\r
- for Arch in self.ArchList:\r
+ if self.Target in ["", "all", "fds"]:\r
+ for Arch in Wa.ArchList:\r
+ GlobalData.gGlobalDefines['ARCH'] = Arch\r
#\r
# Check whether the set fix address is above 4G for 32bit image.\r
#\r
if (Arch == 'IA32' or Arch == 'ARM') and self.LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self.LoadFixAddress >= 0x100000000:\r
- EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to larger than or equal to 4G for the platorm with IA32 or ARM arch modules")\r
+ EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to larger than or equal to 4G for the platform with IA32 or ARM arch modules")\r
#\r
# Get Module List\r
#\r
- ModuleList = []\r
+ ModuleList = {}\r
for Pa in Wa.AutoGenObjectList:\r
for Ma in Pa.ModuleAutoGenList:\r
if Ma == None:\r
continue\r
if not Ma.IsLibrary:\r
- ModuleList.append (Ma)\r
+ ModuleList[Ma.Guid.upper()] = Ma\r
\r
MapBuffer = StringIO('')\r
- #\r
- # Rebase module to the preferred memory address before GenFds\r
- #\r
- self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
- if self.Fdf != '':\r
+ if self.LoadFixAddress != 0:\r
#\r
- # create FDS again for the updated EFI image\r
+ # Rebase module to the preferred memory address before GenFds\r
#\r
- self._Build("fds", Wa)\r
+ self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
+ if self.Fdf:\r
+ #\r
+ # create FDS again for the updated EFI image\r
+ #\r
+ self._Build("fds", Wa)\r
+ if self.Fdf:\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
- self._CollectFvMapBuffer(MapBuffer, Wa)\r
+ self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)\r
#\r
# Save MAP buffer into MAP file.\r
#\r
#\r
def _BuildModule(self):\r
for BuildTarget in self.BuildTargetList:\r
+ GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
for ToolChain in self.ToolChainList:\r
+ GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
+ GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
#\r
# module build needs platform build information, so get platform\r
# AutoGen first\r
#\r
Wa = WorkspaceAutoGen(\r
self.WorkspaceDir,\r
- self.Platform,\r
+ self.PlatformFile,\r
BuildTarget,\r
ToolChain,\r
self.ArchList,\r
self.Fdf,\r
self.FdList,\r
self.FvList,\r
- self.SkuId\r
+ self.CapList,\r
+ self.SkuId,\r
+ self.UniFlag,\r
+ self.Progress,\r
+ self.ModuleFile\r
)\r
- self.BuildReport.AddPlatformReport(Wa)\r
+ self.Fdf = Wa.FdfFile\r
+ self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
Wa.CreateMakeFile(False)\r
self.Progress.Stop("done!")\r
MaList = []\r
- for Arch in self.ArchList:\r
+ for Arch in Wa.ArchList:\r
+ GlobalData.gGlobalDefines['ARCH'] = Arch\r
Ma = ModuleAutoGen(Wa, self.ModuleFile, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
if Ma == None: continue\r
MaList.append(Ma)\r
self._Build(self.Target, Ma)\r
+\r
+ self.BuildReport.AddPlatformReport(Wa, MaList)\r
if MaList == []:\r
EdkLogger.error(\r
'build',\r
"Module for [%s] is not a component of active platform."\\r
" Please make sure that the ARCH and inf file path are"\\r
" given in the same as in [%s]" %\\r
- (', '.join(self.ArchList), self.Platform),\r
+ (', '.join(Wa.ArchList), self.PlatformFile),\r
ExtraData=self.ModuleFile\r
)\r
# Create MAP file when Load Fix Address is enabled.\r
- if self.LoadFixAddress != 0 and self.Target == "fds" and self.Fdf != '':\r
- for Arch in self.ArchList:\r
+ if self.Target == "fds" and self.Fdf:\r
+ for Arch in Wa.ArchList:\r
#\r
# Check whether the set fix address is above 4G for 32bit image.\r
#\r
#\r
# Get Module List\r
#\r
- ModuleList = []\r
+ ModuleList = {}\r
for Pa in Wa.AutoGenObjectList:\r
for Ma in Pa.ModuleAutoGenList:\r
if Ma == None:\r
continue\r
if not Ma.IsLibrary:\r
- ModuleList.append (Ma)\r
+ ModuleList[Ma.Guid.upper()] = Ma\r
\r
MapBuffer = StringIO('')\r
- #\r
- # Rebase module to the preferred memory address before GenFds\r
- #\r
- self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
- #\r
- # create FDS again for the updated EFI image\r
- #\r
- self._Build("fds", Wa)\r
+ if self.LoadFixAddress != 0:\r
+ #\r
+ # Rebase module to the preferred memory address before GenFds\r
+ #\r
+ self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
+ #\r
+ # create FDS again for the updated EFI image\r
+ #\r
+ self._Build("fds", Wa)\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
- self._CollectFvMapBuffer(MapBuffer, Wa)\r
+ self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)\r
#\r
# Save MAP buffer into MAP file.\r
#\r
#\r
def _MultiThreadBuildPlatform(self):\r
for BuildTarget in self.BuildTargetList:\r
+ GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
for ToolChain in self.ToolChainList:\r
+ GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
+ GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
Wa = WorkspaceAutoGen(\r
self.WorkspaceDir,\r
- self.Platform,\r
+ self.PlatformFile,\r
BuildTarget,\r
ToolChain,\r
self.ArchList,\r
self.Fdf,\r
self.FdList,\r
self.FvList,\r
- self.SkuId\r
+ self.CapList,\r
+ self.SkuId,\r
+ self.UniFlag,\r
+ self.Progress\r
)\r
+ self.Fdf = Wa.FdfFile\r
+ self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
self.BuildReport.AddPlatformReport(Wa)\r
Wa.CreateMakeFile(False)\r
\r
# multi-thread exit flag\r
ExitFlag = threading.Event()\r
ExitFlag.clear()\r
- for Arch in self.ArchList:\r
+ for Arch in Wa.ArchList:\r
+ GlobalData.gGlobalDefines['ARCH'] = Arch\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
if Pa == None:\r
continue\r
+ pModules = []\r
for Module in Pa.Platform.Modules:\r
# Get ModuleAutoGen object to generate C code file and makefile\r
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
\r
if not self.SkipAutoGen or self.Target == 'genmake':\r
Ma.CreateMakeFile(True)\r
+ Ma.CreateAsBuiltInf()\r
if self.Target == "genmake":\r
continue\r
- self.Progress.Stop("done!")\r
+ pModules.append(Ma)\r
+ self.Progress.Stop("done!")\r
+\r
+ for Ma in pModules:\r
# Generate build task for the module\r
Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target))\r
# Break build if any build thread has error\r
if BuildTask.HasError():\r
EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
\r
+ #\r
+ # Save temp tables to a TmpTableDict.\r
+ #\r
+ for Key in Wa.BuildDatabase._CACHE_:\r
+ if Wa.BuildDatabase._CACHE_[Key]._RawData and Wa.BuildDatabase._CACHE_[Key]._RawData._Table and Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table:\r
+ if TemporaryTablePattern.match(Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table):\r
+ TmpTableDict[Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table] = Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Cur\r
+ #\r
#\r
# All modules have been put in build tasks queue. Tell task scheduler\r
# to exit if all tasks are completed\r
EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
\r
# Create MAP file when Load Fix Address is enabled.\r
- if self.Target in ["", "all", "fds"] and self.LoadFixAddress != 0:\r
- for Arch in self.ArchList:\r
+ if self.Target in ["", "all", "fds"]:\r
+ for Arch in Wa.ArchList:\r
#\r
# Check whether the set fix address is above 4G for 32bit image.\r
#\r
#\r
# Get Module List\r
#\r
- ModuleList = []\r
+ ModuleList = {}\r
for Pa in Wa.AutoGenObjectList:\r
for Ma in Pa.ModuleAutoGenList:\r
if Ma == None:\r
continue\r
if not Ma.IsLibrary:\r
- ModuleList.append (Ma)\r
+ ModuleList[Ma.Guid.upper()] = Ma\r
#\r
# Rebase module to the preferred memory address before GenFds\r
#\r
MapBuffer = StringIO('')\r
- self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
+ if self.LoadFixAddress != 0:\r
+ self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
\r
- # Generate FD image if there's a FDF file found\r
- if self.Fdf != '' and self.Target in ["", "all", "fds"]:\r
- LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
-\r
- # Create MAP file for all platform FV after GenFds\r
- if self.Target in ["", "all", "fds"] and self.LoadFixAddress != 0:\r
- if self.Fdf != '':\r
+ if self.Fdf:\r
+ #\r
+ # Generate FD image if there's a FDF file found\r
+ #\r
+ LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
- self._CollectFvMapBuffer(MapBuffer, Wa)\r
+ self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)\r
#\r
# Save MAP buffer into MAP file.\r
#\r
## Generate GuidedSectionTools.txt in the FV directories.\r
#\r
def CreateGuidedSectionToolsFile(self):\r
- for Arch in self.ArchList:\r
- for BuildTarget in self.BuildTargetList:\r
- for ToolChain in self.ToolChainList:\r
- FvDir = os.path.join(\r
- self.WorkspaceDir,\r
- self.Platform.OutputDirectory,\r
- '_'.join((BuildTarget, ToolChain)),\r
- 'FV'\r
- )\r
- if not os.path.exists(FvDir):\r
- continue\r
+ for BuildTarget in self.BuildTargetList:\r
+ for ToolChain in self.ToolChainList:\r
+ Wa = WorkspaceAutoGen(\r
+ self.WorkspaceDir,\r
+ self.PlatformFile,\r
+ BuildTarget,\r
+ ToolChain,\r
+ self.ArchList,\r
+ self.BuildDatabase,\r
+ self.TargetTxt,\r
+ self.ToolDef,\r
+ self.Fdf,\r
+ self.FdList,\r
+ self.FvList,\r
+ self.CapList,\r
+ self.SkuId,\r
+ self.UniFlag\r
+ )\r
+ FvDir = Wa.FvDir\r
+ if not os.path.exists(FvDir):\r
+ continue\r
+\r
+ for Arch in self.ArchList:\r
# Build up the list of supported architectures for this build\r
prefix = '%s_%s_%s_' % (BuildTarget, ToolChain, Arch)\r
\r
## Launch the module or platform build\r
#\r
def Launch(self):\r
- if self.ModuleFile == None or self.ModuleFile == "":\r
+ if not self.ModuleFile:\r
if not self.SpawnMode or self.Target not in ["", "all"]:\r
self.SpawnMode = False\r
self._BuildPlatform()\r
if DefineList != None:\r
for Define in DefineList:\r
DefineTokenList = Define.split("=", 1)\r
+ if not GlobalData.gMacroNamePattern.match(DefineTokenList[0]):\r
+ EdkLogger.error('build', FORMAT_INVALID,\r
+ "The macro name must be in the pattern [A-Z][A-Z0-9_]*",\r
+ ExtraData=DefineTokenList[0])\r
+\r
if len(DefineTokenList) == 1:\r
- DefineDict[DefineTokenList[0]] = ""\r
+ DefineDict[DefineTokenList[0]] = "TRUE"\r
else:\r
DefineDict[DefineTokenList[0]] = DefineTokenList[1].strip()\r
return DefineDict\r
#\r
def MyOptionParser():\r
Parser = OptionParser(description=__copyright__,version=__version__,prog="build.exe",usage="%prog [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run]")\r
- Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC','ARM'], dest="TargetArch",\r
- help="ARCHS is one of list: IA32, X64, IPF, ARM or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.")\r
+ Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC','ARM', 'AARCH64'], dest="TargetArch",\r
+ help="ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.")\r
Parser.add_option("-p", "--platform", action="callback", type="string", dest="PlatformFile", callback=SingleCheckCallback,\r
help="Build the platform specified by the DSC file name argument, overriding target.txt's ACTIVE_PLATFORM definition.")\r
Parser.add_option("-m", "--module", action="callback", type="string", dest="ModuleFile", callback=SingleCheckCallback,\r
help="Build the module specified by the INF file name argument.")\r
- Parser.add_option("-b", "--buildtarget", action="append", type="choice", choices=['DEBUG','RELEASE'], dest="BuildTarget",\r
- help="BuildTarget is one of list: DEBUG, RELEASE, which overrides target.txt's TARGET definition. To specify more TARGET, please repeat this option.")\r
+ Parser.add_option("-b", "--buildtarget", type="string", dest="BuildTarget", help="Using the TARGET to build the platform, overriding target.txt's TARGET definition.",\r
+ action="append")\r
Parser.add_option("-t", "--tagname", action="append", type="string", dest="ToolChain",\r
help="Using the Tool Chain Tagname to build the platform, overriding target.txt's TOOL_CHAIN_TAG definition.")\r
Parser.add_option("-x", "--sku-id", action="callback", type="string", dest="SkuId", callback=SingleCheckCallback,\r
help="The name of FD to be generated. The name must be from [FD] section in FDF file.")\r
Parser.add_option("-i", "--fv-image", action="append", type="string", dest="FvImage", default=[],\r
help="The name of FV to be generated. The name must be from [FV] section in FDF file.")\r
-\r
+ Parser.add_option("-C", "--capsule-image", action="append", type="string", dest="CapName", default=[],\r
+ help="The name of Capsule to be generated. The name must be from [Capsule] section in FDF file.")\r
Parser.add_option("-u", "--skip-autogen", action="store_true", dest="SkipAutoGen", help="Skip AutoGen step.")\r
Parser.add_option("-e", "--re-parse", action="store_true", dest="Reparse", help="Re-parse all meta-data files.")\r
\r
- Parser.add_option("-c", "--case-insensitive", action="store_true", dest="CaseInsensitive", help="Don't check case of file name.")\r
-\r
- # Parser.add_option("-D", "--define", action="append", dest="Defines", metavar="NAME[=[VALUE]]",\r
- # help="Define global macro which can be used in DSC/DEC/INF files.")\r
+ Parser.add_option("-c", "--case-insensitive", action="store_true", dest="CaseInsensitive", default=False, help="Don't check case of file name.")\r
\r
Parser.add_option("-w", "--warning-as-error", action="store_true", dest="WarningAsError", help="Treat warning in tools as error.")\r
Parser.add_option("-j", "--log", action="store", dest="LogFile", help="Put log in specified file as well as on console.")\r
Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDRESS', 'EXECUTION_ORDER'], dest="ReportType", default=[],\r
help="Flags that control the type of build report to generate. Must be one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, EXECUTION_ORDER]. "\\r
"To specify more than one flag, repeat this option on the command line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS]")\r
+ Parser.add_option("-F", "--flag", action="store", type="string", dest="Flag",\r
+ help="Specify the specific option to parse EDK UNI file. Must be one of: [-c, -s]. -c is for EDK framework UNI file, and -s is for EDK UEFI UNI file. "\\r
+ "This option can also be specified by setting *_*_*_BUILD_FLAGS in [BuildOptions] section of platform DSC. If they are both specified, this value "\\r
+ "will override the setting in [BuildOptions] section of platform DSC.")\r
+ Parser.add_option("-N", "--no-cache", action="store_true", dest="DisableCache", default=False, help="Disable build cache mechanism")\r
\r
(Opt, Args)=Parser.parse_args()\r
return (Opt, Args)\r
else:\r
GlobalData.gIsWindows = False\r
\r
- EdkLogger.quiet(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime()) + "[%s]\n" % platform.platform())\r
+ EdkLogger.quiet("Build environment: %s" % platform.platform())\r
+ EdkLogger.quiet(time.strftime("Build start time: %H:%M:%S, %b.%d %Y\n", time.localtime()));\r
ReturnCode = 0\r
MyBuild = None\r
try:\r
EdkLogger.error("build", OPTION_NOT_SUPPORTED, "Not supported target [%s]." % Target,\r
ExtraData="Please select one of: %s" %(' '.join(gSupportedTarget)))\r
\r
- GlobalData.gGlobalDefines = ParseDefines(Option.Macros)\r
#\r
# Check environment variable: EDK_TOOLS_PATH, WORKSPACE, PATH\r
#\r
CheckEnvVariable()\r
+ GlobalData.gCommandLineDefines.update(ParseDefines(Option.Macros))\r
+\r
Workspace = os.getenv("WORKSPACE")\r
#\r
# Get files real name in workspace dir\r
if os.path.normcase (os.path.normpath(Option.PlatformFile)).find (Workspace) == 0:\r
Option.PlatformFile = NormFile(os.path.normpath(Option.PlatformFile), Workspace)\r
Option.PlatformFile = PathClass(Option.PlatformFile, Workspace)\r
- ErrorCode, ErrorInfo = Option.PlatformFile.Validate(".dsc", False)\r
- if ErrorCode != 0:\r
- EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
if Option.FdfFile != None:\r
if os.path.isabs (Option.FdfFile):\r
if ErrorCode != 0:\r
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
- MyBuild = Build(Target, Workspace, Option.PlatformFile, Option.ModuleFile,\r
- Option.TargetArch, Option.ToolChain, Option.BuildTarget,\r
- Option.FdfFile, Option.RomImage, Option.FvImage,\r
- None, Option.SilentMode, Option.ThreadNumber,\r
- Option.SkipAutoGen, Option.Reparse, Option.SkuId, \r
- Option.ReportFile, Option.ReportType)\r
+ if Option.Flag != None and Option.Flag not in ['-c', '-s']:\r
+ EdkLogger.error("build", OPTION_VALUE_INVALID, "UNI flag must be one of -c or -s")\r
+\r
+ MyBuild = Build(Target, Workspace, Option)\r
+ GlobalData.gCommandLineDefines['ARCH'] = ' '.join(MyBuild.ArchList)\r
MyBuild.Launch()\r
+ # Drop temp tables to avoid database locked.\r
+ for TmpTableName in TmpTableDict:\r
+ SqlCommand = """drop table IF EXISTS %s""" % TmpTableName\r
+ TmpTableDict[TmpTableName].execute(SqlCommand)\r
#MyBuild.DumpBuildData()\r
except FatalError, X:\r
if MyBuild != None:\r
else:\r
Conclusion = "Failed"\r
FinishTime = time.time()\r
- BuildDuration = time.strftime("%M:%S", time.gmtime(int(round(FinishTime - StartTime))))\r
+ BuildDuration = time.gmtime(int(round(FinishTime - StartTime)))\r
+ BuildDurationStr = ""\r
+ if BuildDuration.tm_yday > 1:\r
+ BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration) + ", %d day(s)"%(BuildDuration.tm_yday - 1)\r
+ else:\r
+ BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration)\r
if MyBuild != None:\r
- MyBuild.BuildReport.GenerateReport(BuildDuration)\r
+ MyBuild.BuildReport.GenerateReport(BuildDurationStr)\r
MyBuild.Db.Close()\r
EdkLogger.SetLevel(EdkLogger.QUIET)\r
- EdkLogger.quiet("\n- %s -\n%s [%s]" % (Conclusion, time.strftime("%H:%M:%S, %b.%d %Y", time.localtime()), BuildDuration))\r
-\r
+ EdkLogger.quiet("\n- %s -" % Conclusion)\r
+ EdkLogger.quiet(time.strftime("Build end time: %H:%M:%S, %b.%d %Y", time.localtime()))\r
+ EdkLogger.quiet("Build total time: %s\n" % BuildDurationStr)\r
return ReturnCode\r
\r
if __name__ == '__main__':\r
projects / mirror_edk2.git / blobdiff