## @file\r
# build a platform or a module\r
#\r
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\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
+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
import Common.GlobalData as GlobalData\r
\r
# Version and Copyright\r
-VersionNumber = "0.5" + ' ' + gBUILD_VERSION\r
+VersionNumber = "0.60" + ' ' + 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
\r
## build configuration file\r
-gBuildConfiguration = "Conf/target.txt"\r
-gBuildCacheDir = "Conf/.cache"\r
-gToolsDefinition = "Conf/tools_def.txt"\r
+gBuildConfiguration = "target.txt"\r
+gToolsDefinition = "tools_def.txt"\r
\r
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')\r
TmpTableDict = {}\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. Edk modules could not be built." % EcpSourceDir)\r
elif ' ' in EcpSourceDir:\r
# if working directory doesn't exist, Popen() will raise an exception\r
if not os.path.isdir(WorkingDir):\r
EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=WorkingDir)\r
+ \r
+ # Command is used as the first Argument in following Popen().\r
+ # It could be a string or sequence. We find that if command is a string in following Popen(),\r
+ # ubuntu may fail with an error message that the command is not found.\r
+ # So here we may need convert command from string to list instance.\r
+ if not isinstance(Command, list):\r
+ if platform.system() != 'Windows':\r
+ Command = Command.split()\r
\r
Proc = None\r
EndOfProcedure = None\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
+ "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
def AddDependency(self, Dependency):\r
for Dep in Dependency:\r
- self.DependencyList.append(BuildTask.New(Dep)) # BuildTask list\r
+ if not Dep.BuildObject.IsBinaryModule:\r
+ self.DependencyList.append(BuildTask.New(Dep)) # BuildTask list\r
\r
## The thread wrapper of LaunchCommand function\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 OutputDir The output directory for image.\r
self.SkipAutoGen = BuildOptions.SkipAutoGen\r
self.Reparse = BuildOptions.Reparse\r
self.SkuId = BuildOptions.SkuId\r
+ self.ConfDirectory = BuildOptions.ConfDirectory\r
self.SpawnMode = True\r
self.BuildReport = BuildReport(BuildOptions.ReportFile, BuildOptions.ReportType)\r
self.TargetTxt = TargetTxtClassObject()\r
self.ToolDef = ToolDefClassObject()\r
+ #Set global flag for build mode\r
+ GlobalData.gIgnoreSource = BuildOptions.IgnoreSources\r
+\r
+ if self.ConfDirectory:\r
+ # Get alternate Conf location, if it is absolute, then just use the absolute directory name\r
+ ConfDirectoryPath = os.path.normpath(self.ConfDirectory)\r
+\r
+ if not os.path.isabs(ConfDirectoryPath):\r
+ # Since alternate directory name is not absolute, the alternate directory is located within the WORKSPACE\r
+ # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf\r
+ ConfDirectoryPath = os.path.join(self.WorkspaceDir, ConfDirectoryPath)\r
+ else:\r
+ # Get standard WORKSPACE/Conf use the absolute path to the WORKSPACE/Conf\r
+ ConfDirectoryPath = os.path.join(self.WorkspaceDir, 'Conf')\r
+ GlobalData.gConfDirectory = ConfDirectoryPath\r
+ GlobalData.gDatabasePath = os.path.normpath(os.path.join(ConfDirectoryPath, GlobalData.gDatabasePath))\r
+\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.Db = WorkspaceDatabase(GlobalData.gDatabasePath, self.Reparse)\r
+ self.BuildDatabase = self.Db.BuildObject\r
+ self.Platform = None\r
self.LoadFixAddress = 0\r
self.UniFlag = BuildOptions.Flag\r
+ self.BuildModules = []\r
\r
# print dot character during doing some time-consuming work\r
self.Progress = Utils.Progressor()\r
#\r
# Check target.txt and tools_def.txt and Init them\r
#\r
- BuildConfigurationFile = os.path.normpath(os.path.join(self.WorkspaceDir, gBuildConfiguration))\r
+ BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, gBuildConfiguration))\r
if os.path.isfile(BuildConfigurationFile) == True:\r
StatusCode = self.TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
\r
ToolDefinitionFile = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
if ToolDefinitionFile == '':\r
ToolDefinitionFile = gToolsDefinition\r
- ToolDefinitionFile = os.path.normpath(os.path.join(self.WorkspaceDir, ToolDefinitionFile))\r
+ ToolDefinitionFile = os.path.normpath(os.path.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
if os.path.isfile(ToolDefinitionFile) == True:\r
StatusCode = self.ToolDef.LoadToolDefFile(ToolDefinitionFile)\r
else:\r
#\r
def InitBuild(self):\r
# parse target.txt, tools_def.txt, and platform file\r
- self.LoadConfiguration() \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
# @param CreateDepModuleMakeFile Flag used to indicate creating makefile\r
# for dependent modules/Libraries\r
#\r
- def _Build(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True):\r
+ def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
if AutoGenObject == None:\r
return False\r
\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
if BuildCommand == None or len(BuildCommand) == 0:\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
+ "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
+ makefile = GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.gMakeType]\r
+\r
+ # genfds\r
+ if Target == 'fds':\r
+ LaunchCommand(AutoGenObject.GenFdsCommand, AutoGenObject.MakeFileDir)\r
+ return True\r
+\r
+ # run\r
+ if Target == 'run':\r
+ RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir, 'IA32'))\r
+ Command = '.\SecMain'\r
+ os.chdir(RunDir)\r
+ LaunchCommand(Command, RunDir)\r
+ return True\r
+\r
+ # build modules\r
+ if BuildModule:\r
+ BuildCommand = BuildCommand + [Target]\r
+ LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+ self.CreateAsBuiltInf()\r
+ return True\r
+\r
+ # build library\r
+ if Target == 'libraries':\r
+ for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+ NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Lib, makefile)), 'pbuild']\r
+ LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+ return True\r
+\r
+ # build module\r
+ if Target == 'modules':\r
+ for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+ NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Lib, makefile)), 'pbuild']\r
+ LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+ for Mod in AutoGenObject.ModuleBuildDirectoryList:\r
+ NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Mod, makefile)), 'pbuild']\r
+ LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+ self.CreateAsBuiltInf()\r
+ return True\r
+\r
+ # cleanlib\r
+ if Target == 'cleanlib':\r
+ for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+ LibMakefile = os.path.normpath(os.path.join(Lib, makefile))\r
+ if os.path.exists(LibMakefile):\r
+ NewBuildCommand = BuildCommand + ['-f', LibMakefile, 'cleanall']\r
+ LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+ return True\r
+\r
+ # clean\r
+ if Target == 'clean':\r
+ for Mod in AutoGenObject.ModuleBuildDirectoryList:\r
+ ModMakefile = os.path.normpath(os.path.join(Mod, makefile))\r
+ if os.path.exists(ModMakefile):\r
+ NewBuildCommand = BuildCommand + ['-f', ModMakefile, 'cleanall']\r
+ LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+ for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+ LibMakefile = os.path.normpath(os.path.join(Lib, makefile))\r
+ if os.path.exists(LibMakefile):\r
+ NewBuildCommand = BuildCommand + ['-f', LibMakefile, 'cleanall']\r
+ LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+ return True\r
+\r
+ # cleanall\r
+ if Target == 'cleanall':\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(os.path.dirname(GlobalData.gDatabasePath), True)\r
+ except WindowsError, X:\r
+ EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
+ return True\r
+\r
+ ## Build a module or platform\r
+ #\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
+ # @param Platform The platform file\r
+ # @param Module The module file\r
+ # @param BuildTarget The name of build target, one of "DEBUG", "RELEASE"\r
+ # @param ToolChain The name of toolchain to build\r
+ # @param Arch The arch of the module/platform\r
+ # @param CreateDepModuleCodeFile Flag used to indicate creating code\r
+ # for dependent modules/Libraries\r
+ # @param CreateDepModuleMakeFile Flag used to indicate creating makefile\r
+ # for dependent modules/Libraries\r
+ #\r
+ def _Build(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
+ if AutoGenObject == None:\r
+ return False\r
+\r
+ # skip file generation for cleanxxx targets, run and fds target\r
+ if Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:\r
+ # for target which must generate AutoGen code and makefile\r
+ if not self.SkipAutoGen or Target == 'genc':\r
+ self.Progress.Start("Generating code")\r
+ AutoGenObject.CreateCodeFile(CreateDepsCodeFile)\r
+ self.Progress.Stop("done!")\r
+ if Target == "genc":\r
+ return True\r
+\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
+ else:\r
+ # always recreate top/platform makefile when clean, just in case of inconsistency\r
+ AutoGenObject.CreateCodeFile(False)\r
+ AutoGenObject.CreateMakeFile(False)\r
+\r
+ if EdkLogger.GetLevel() == EdkLogger.QUIET:\r
+ EdkLogger.quiet("Building ... %s" % repr(AutoGenObject))\r
+\r
+ BuildCommand = AutoGenObject.BuildCommand\r
+ if BuildCommand == None or len(BuildCommand) == 0:\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
+ # genfds\r
+ if Target == 'fds':\r
+ LaunchCommand(AutoGenObject.GenFdsCommand, AutoGenObject.MakeFileDir)\r
+ return True\r
+\r
+ # run\r
+ if Target == 'run':\r
+ RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir, 'IA32'))\r
+ Command = '.\SecMain'\r
+ os.chdir(RunDir)\r
+ LaunchCommand(Command, RunDir)\r
+ return True\r
+\r
+ # build modules\r
BuildCommand = BuildCommand + [Target]\r
- LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+ if BuildModule:\r
+ LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+ self.CreateAsBuiltInf()\r
+ return True\r
+\r
+ # build library\r
+ if Target == 'libraries':\r
+ pass\r
+\r
+ # not build modules\r
+\r
+\r
+ # cleanall\r
if Target == 'cleanall':\r
try:\r
#os.rmdir(AutoGenObject.BuildDir)\r
# First should close DB.\r
#\r
self.Db.Close()\r
- RemoveDirectory(gBuildCacheDir, True)\r
+ RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)\r
except WindowsError, X:\r
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
return True\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' % (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' % (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
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
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
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) \r
+ 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
- PeiBaseAddr = TopMemoryAddress - RtSize - BtSize \r
+\r
+ PeiBaseAddr = TopMemoryAddress - RtSize - BtSize\r
BtBaseAddr = TopMemoryAddress - RtSize\r
- RtBaseAddr = TopMemoryAddress - ReservedRuntimeMemorySize \r
+ RtBaseAddr = TopMemoryAddress - ReservedRuntimeMemorySize\r
\r
self._RebaseModule (MapBuffer, PeiBaseAddr, PeiModuleList, TopMemoryAddress == 0)\r
self._RebaseModule (MapBuffer, BtBaseAddr, BtModuleList, TopMemoryAddress == 0)\r
MapBuffer.write('\n\n')\r
sys.stdout.write ("\n")\r
sys.stdout.flush()\r
- \r
+\r
## Save platform Map file\r
#\r
def _SaveMapFile (self, MapBuffer, Wa):\r
self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
self.BuildReport.AddPlatformReport(Wa)\r
self.Progress.Stop("done!")\r
- self._Build(self.Target, Wa)\r
- \r
+ for Arch in Wa.ArchList:\r
+ GlobalData.gGlobalDefines['ARCH'] = Arch\r
+ Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\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
+ if Ma == None:\r
+ continue\r
+ self.BuildModules.append(Ma)\r
+ self._BuildPa(self.Target, Pa)\r
+\r
# Create MAP file when Load Fix Address is enabled.\r
if self.Target in ["", "all", "fds"]:\r
for Arch in Wa.ArchList:\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
for ToolChain in self.ToolChainList:\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
- GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain \r
+ GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
#\r
# module build needs platform build information, so get platform\r
# AutoGen first\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
+ self.BuildModules.append(Ma)\r
+ if not Ma.IsBinaryModule:\r
+ self._Build(self.Target, Ma, BuildModule=True)\r
\r
self.BuildReport.AddPlatformReport(Wa, MaList)\r
if MaList == []:\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
for ToolChain in self.ToolChainList:\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
- GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain \r
+ GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
Wa = WorkspaceAutoGen(\r
self.WorkspaceDir,\r
self.PlatformFile,\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
if Pa == None:\r
continue\r
- for Module in Pa.Platform.Modules:\r
+ ModuleList = []\r
+ for Inf in Pa.Platform.Modules:\r
+ ModuleList.append(Inf)\r
+ # Add the INF only list in FDF\r
+ if GlobalData.gFdfParser != None:\r
+ for InfName in GlobalData.gFdfParser.Profile.InfList:\r
+ Inf = PathClass(NormPath(InfName), self.WorkspaceDir, Arch)\r
+ if Inf in Pa.Platform.Modules:\r
+ continue\r
+ ModuleList.append(Inf)\r
+ for Module in ModuleList:\r
# Get ModuleAutoGen object to generate C code file and makefile\r
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
+ \r
if Ma == None:\r
continue\r
# Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'\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
+ self.BuildModules.append(Ma)\r
+ self.Progress.Stop("done!")\r
+\r
+ for Ma in self.BuildModules:\r
# Generate build task for the module\r
- Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target))\r
+ if not Ma.IsBinaryModule:\r
+ Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target))\r
# Break build if any build thread has error\r
if BuildTask.HasError():\r
# we need a full version of makefile for platform\r
#\r
ExitFlag.set()\r
BuildTask.WaitForComplete()\r
+ self.CreateAsBuiltInf()\r
\r
#\r
# Check for build error, and raise exception if one\r
#\r
# Generate FD image if there's a FDF file found\r
#\r
- LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
+ LaunchCommand(Wa.GenFdsCommand, os.getcwd())\r
+\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
if not os.path.exists(FvDir):\r
continue\r
\r
- for Arch in self.ArchList: \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
+\r
# Look through the tool definitions for GUIDed tools\r
guidAttribs = []\r
for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.iteritems():\r
path = self.ToolDef.ToolsDefTxtDictionary[path]\r
path = self.GetFullPathOfTool(path)\r
guidAttribs.append((guid, toolName, path))\r
- \r
+\r
# Write out GuidedSecTools.txt\r
toolsFile = os.path.join(FvDir, 'GuidedSectionTools.txt')\r
toolsFile = open(toolsFile, 'wt')\r
self.SpawnMode = False\r
self._BuildModule()\r
\r
+ def CreateAsBuiltInf(self):\r
+ for Module in self.BuildModules:\r
+ Module.CreateAsBuiltInf()\r
+ self.BuildModules = []\r
## Do some clean-up works when error occurred\r
def Relinquish(self):\r
OldLogLevel = EdkLogger.GetLevel()\r
EdkLogger.SetLevel(OldLogLevel)\r
\r
def DumpBuildData(self):\r
- CacheDirectory = os.path.join(self.WorkspaceDir, gBuildCacheDir)\r
+ CacheDirectory = os.path.dirname(GlobalData.gDatabasePath)\r
Utils.CreateDirectory(CacheDirectory)\r
Utils.DataDump(Utils.gFileTimeStampCache, os.path.join(CacheDirectory, "gFileTimeStampCache"))\r
Utils.DataDump(Utils.gDependencyDatabase, os.path.join(CacheDirectory, "gDependencyDatabase"))\r
\r
def RestoreBuildData(self):\r
- FilePath = os.path.join(self.WorkspaceDir, gBuildCacheDir, "gFileTimeStampCache")\r
+ FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gFileTimeStampCache")\r
if Utils.gFileTimeStampCache == {} and os.path.isfile(FilePath):\r
Utils.gFileTimeStampCache = Utils.DataRestore(FilePath)\r
if Utils.gFileTimeStampCache == None:\r
Utils.gFileTimeStampCache = {}\r
\r
- FilePath = os.path.join(self.WorkspaceDir, gBuildCacheDir, "gDependencyDatabase")\r
+ FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gDependencyDatabase")\r
if Utils.gDependencyDatabase == {} and os.path.isfile(FilePath):\r
Utils.gDependencyDatabase = Utils.DataRestore(FilePath)\r
if Utils.gDependencyDatabase == None:\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
+\r
if len(DefineTokenList) == 1:\r
DefineDict[DefineTokenList[0]] = "TRUE"\r
else:\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
"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
+ Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")\r
+ Parser.add_option("--check-usage", action="store_true", dest="CheckUsage", default=False, help="Check usage content of entries listed in INF file.")\r
+ Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")\r
\r
(Opt, Args)=Parser.parse_args()\r
return (Opt, Args)\r
"\nbuild",\r
CODE_ERROR,\r
"Unknown fatal error when processing [%s]" % MetaFile,\r
- ExtraData="\n(Please send email to edk2-buildtools-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",\r
+ ExtraData="\n(Please send email to edk2-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",\r
RaiseError=False\r
)\r
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
ReturnCode = CODE_ERROR\r
finally:\r
Utils.Progressor.Abort()\r
+ Utils.ClearDuplicatedInf()\r
\r
if ReturnCode == 0:\r
Conclusion = "Done"\r
projects / mirror_edk2.git / blobdiff