# build a platform or a module\r
#\r
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, 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
+from __future__ import print_function\r
import Common.LongFilePathOs as os\r
import re\r
-import StringIO\r
+from io import BytesIO\r
import sys\r
import glob\r
import time\r
import traceback\r
import encodings.ascii\r
import itertools\r
+import multiprocessing\r
\r
from struct import *\r
from threading import *\r
\r
import Common.EdkLogger\r
import Common.GlobalData as GlobalData\r
+from GenFds.GenFds import GenFds\r
+\r
+from collections import OrderedDict, defaultdict\r
\r
# Version and Copyright\r
VersionNumber = "0.60" + ' ' + gBUILD_VERSION\r
__version__ = "%prog Version " + VersionNumber\r
-__copyright__ = "Copyright (c) 2007 - 2017, Intel Corporation All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2018, 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
# Otherwise, False is returned\r
#\r
def IsToolInPath(tool):\r
- if os.environ.has_key('PATHEXT'):\r
+ if 'PATHEXT' in os.environ:\r
extns = os.environ['PATHEXT'].split(os.path.pathsep)\r
else:\r
extns = ('',)\r
\r
WorkspaceDir = os.path.normcase(os.path.normpath(os.environ["WORKSPACE"]))\r
if not os.path.exists(WorkspaceDir):\r
- EdkLogger.error("build", FILE_NOT_FOUND, "WORKSPACE doesn't exist", ExtraData="%s" % WorkspaceDir)\r
+ EdkLogger.error("build", FILE_NOT_FOUND, "WORKSPACE doesn't exist", ExtraData=WorkspaceDir)\r
elif ' ' in WorkspaceDir:\r
EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in WORKSPACE path",\r
ExtraData=WorkspaceDir)\r
os.environ["WORKSPACE"] = WorkspaceDir\r
- \r
+\r
# set multiple workspace\r
PackagesPath = os.getenv("PACKAGES_PATH")\r
mws.setWs(WorkspaceDir, PackagesPath)\r
if mws.PACKAGES_PATH:\r
for Path in mws.PACKAGES_PATH:\r
if not os.path.exists(Path):\r
- EdkLogger.error("build", FILE_NOT_FOUND, "One Path in PACKAGES_PATH doesn't exist", ExtraData="%s" % Path)\r
+ EdkLogger.error("build", FILE_NOT_FOUND, "One Path in PACKAGES_PATH doesn't exist", ExtraData=Path)\r
elif ' ' in Path:\r
EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in PACKAGES_PATH", ExtraData=Path)\r
\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
+\r
## Get normalized file path\r
#\r
# Convert the path to be local format, and remove the WORKSPACE path at the\r
# read one line a time\r
Line = From.readline()\r
# empty string means "end"\r
- if Line != None and Line != "":\r
+ if Line is not None and Line != "":\r
To(Line.rstrip())\r
else:\r
break\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
+\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
except: # in case of aborting\r
# terminate the threads redirecting the program output\r
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
- if EndOfProcedure != None:\r
+ if EndOfProcedure is not None:\r
EndOfProcedure.set()\r
- if Proc == None:\r
- if type(Command) != type(""):\r
+ if Proc is None:\r
+ if not isinstance(Command, type("")):\r
Command = " ".join(Command)\r
EdkLogger.error("build", COMMAND_FAILURE, "Failed to start command", ExtraData="%s [%s]" % (Command, WorkingDir))\r
\r
\r
# check the return code of the program\r
if Proc.returncode != 0:\r
- if type(Command) != type(""):\r
+ if not isinstance(Command, type("")):\r
Command = " ".join(Command)\r
# print out the Response file and its content when make failure\r
RespFile = os.path.join(WorkingDir, 'OUTPUT', 'respfilelist.txt')\r
# @param Other The other BuildUnit object compared to\r
#\r
def __eq__(self, Other):\r
- return Other != None and self.BuildObject == Other.BuildObject \\r
+ return Other and self.BuildObject == Other.BuildObject \\r
+ and Other.BuildObject \\r
and self.BuildObject.Arch == Other.BuildObject.Arch\r
\r
## hash() method\r
#\r
class BuildTask:\r
# queue for tasks waiting for schedule\r
- _PendingQueue = sdict()\r
+ _PendingQueue = OrderedDict()\r
_PendingQueueLock = threading.Lock()\r
\r
# queue for tasks ready for running\r
- _ReadyQueue = sdict()\r
+ _ReadyQueue = OrderedDict()\r
_ReadyQueueLock = threading.Lock()\r
\r
# queue for run tasks\r
- _RunningQueue = sdict()\r
+ _RunningQueue = OrderedDict()\r
_RunningQueueLock = threading.Lock()\r
\r
# queue containing all build tasks, in case duplicate build\r
- _TaskQueue = sdict()\r
+ _TaskQueue = OrderedDict()\r
\r
# flag indicating error occurs in a running thread\r
_ErrorFlag = threading.Event()\r
BuildTask._Thread.acquire(True)\r
\r
# start a new build thread\r
- Bo = BuildTask._ReadyQueue.keys()[0]\r
- Bt = BuildTask._ReadyQueue.pop(Bo)\r
+ Bo, Bt = BuildTask._ReadyQueue.popitem()\r
\r
# move into running queue\r
BuildTask._RunningQueueLock.acquire()\r
# while not BuildTask._ErrorFlag.isSet() and \\r
while len(BuildTask._RunningQueue) > 0:\r
EdkLogger.verbose("Waiting for thread ending...(%d)" % len(BuildTask._RunningQueue))\r
- EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".join([Th.getName() for Th in threading.enumerate()]))\r
+ EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".join(Th.getName() for Th in threading.enumerate()))\r
# avoid tense loop\r
time.sleep(0.1)\r
- except BaseException, X:\r
+ except BaseException as X:\r
#\r
# TRICK: hide the output of threads left runing, so that the user can\r
# catch the error message easily\r
self.BuildItem = BuildItem\r
\r
self.DependencyList = []\r
- if Dependency == None:\r
+ if Dependency is None:\r
Dependency = BuildItem.Dependency\r
else:\r
Dependency.extend(BuildItem.Dependency)\r
self.SkipAutoGen = BuildOptions.SkipAutoGen\r
self.Reparse = BuildOptions.Reparse\r
self.SkuId = BuildOptions.SkuId\r
+ if self.SkuId:\r
+ GlobalData.gSKUID_CMD = self.SkuId\r
self.ConfDirectory = BuildOptions.ConfDirectory\r
self.SpawnMode = True\r
self.BuildReport = BuildReport(BuildOptions.ReportFile, BuildOptions.ReportType)\r
self.AutoGenTime = 0\r
self.MakeTime = 0\r
self.GenFdsTime = 0\r
- GlobalData.BuildOptionPcd = BuildOptions.OptionPcd\r
+ GlobalData.BuildOptionPcd = BuildOptions.OptionPcd if BuildOptions.OptionPcd else []\r
#Set global flag for build mode\r
GlobalData.gIgnoreSource = BuildOptions.IgnoreSources\r
+ GlobalData.gUseHashCache = BuildOptions.UseHashCache\r
+ GlobalData.gBinCacheDest = BuildOptions.BinCacheDest\r
+ GlobalData.gBinCacheSource = BuildOptions.BinCacheSource\r
+ GlobalData.gEnableGenfdsMultiThread = BuildOptions.GenfdsMultiThread\r
+\r
+ if GlobalData.gBinCacheDest and not GlobalData.gUseHashCache:\r
+ EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-destination must be used together with --hash.")\r
+\r
+ if GlobalData.gBinCacheSource and not GlobalData.gUseHashCache:\r
+ EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-source must be used together with --hash.")\r
+\r
+ if GlobalData.gBinCacheDest and GlobalData.gBinCacheSource:\r
+ EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-destination can not be used together with --binary-source.")\r
+\r
+ if GlobalData.gBinCacheSource:\r
+ BinCacheSource = os.path.normpath(GlobalData.gBinCacheSource)\r
+ if not os.path.isabs(BinCacheSource):\r
+ BinCacheSource = mws.join(self.WorkspaceDir, BinCacheSource)\r
+ GlobalData.gBinCacheSource = BinCacheSource\r
+ else:\r
+ if GlobalData.gBinCacheSource is not None:\r
+ EdkLogger.error("build", OPTION_VALUE_INVALID, ExtraData="Invalid value of option --binary-source.")\r
+\r
+ if GlobalData.gBinCacheDest:\r
+ BinCacheDest = os.path.normpath(GlobalData.gBinCacheDest)\r
+ if not os.path.isabs(BinCacheDest):\r
+ BinCacheDest = mws.join(self.WorkspaceDir, BinCacheDest)\r
+ GlobalData.gBinCacheDest = BinCacheDest\r
+ else:\r
+ if GlobalData.gBinCacheDest is not None:\r
+ EdkLogger.error("build", OPTION_VALUE_INVALID, ExtraData="Invalid value of option --binary-destination.")\r
\r
if self.ConfDirectory:\r
# Get alternate Conf location, if it is absolute, then just use the absolute directory name\r
self.LoadFixAddress = 0\r
self.UniFlag = BuildOptions.Flag\r
self.BuildModules = []\r
+ self.HashSkipModules = []\r
self.Db_Flag = False\r
self.LaunchPrebuildFlag = False\r
- self.PlatformBuildPath = os.path.join(GlobalData.gConfDirectory,'.cache', '.PlatformBuild')\r
+ self.PlatformBuildPath = os.path.join(GlobalData.gConfDirectory, '.cache', '.PlatformBuild')\r
if BuildOptions.CommandLength:\r
GlobalData.gCommandMaxLength = BuildOptions.CommandLength\r
\r
# print current build environment and configuration\r
EdkLogger.quiet("%-16s = %s" % ("WORKSPACE", os.environ["WORKSPACE"]))\r
if "PACKAGES_PATH" in os.environ:\r
- # WORKSPACE env has been converted before. Print the same path style with WORKSPACE env. \r
+ # WORKSPACE env has been converted before. Print the same path style with WORKSPACE env.\r
EdkLogger.quiet("%-16s = %s" % ("PACKAGES_PATH", os.path.normcase(os.path.normpath(os.environ["PACKAGES_PATH"]))))\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
if "EDK_TOOLS_BIN" in os.environ:\r
- # Print the same path style with WORKSPACE env. \r
+ # Print the same path style with WORKSPACE env.\r
EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_BIN", os.path.normcase(os.path.normpath(os.environ["EDK_TOOLS_BIN"]))))\r
EdkLogger.quiet("%-16s = %s" % ("CONF_PATH", GlobalData.gConfDirectory))\r
self.InitPreBuild()\r
# if no tool chain given in command line, get it from target.txt\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
+ if self.ToolChainList is 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
\r
# check if the tool chains are defined or not\r
ToolChainFamily.append(ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool])\r
self.ToolChainFamily = ToolChainFamily\r
\r
- if self.ThreadNumber == None:\r
+ if self.ThreadNumber is None:\r
self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
if self.ThreadNumber == '':\r
self.ThreadNumber = 0\r
self.ThreadNumber = int(self.ThreadNumber, 0)\r
\r
if self.ThreadNumber == 0:\r
- self.ThreadNumber = 1\r
+ try:\r
+ self.ThreadNumber = multiprocessing.cpu_count()\r
+ except (ImportError, NotImplementedError):\r
+ self.ThreadNumber = 1\r
\r
if not self.PlatformFile:\r
PlatformFile = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_ACTIVE_PLATFORM]\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = self.ToolChainList[0]\r
if self.ToolChainFamily:\r
GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[0]\r
- if 'PREBUILD' in GlobalData.gCommandLineDefines.keys():\r
+ if 'PREBUILD' in GlobalData.gCommandLineDefines:\r
self.Prebuild = GlobalData.gCommandLineDefines.get('PREBUILD')\r
else:\r
self.Db.InitDatabase()\r
self.Prebuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList, self.PlatformFile, self.Target)\r
\r
def InitPostBuild(self):\r
- if 'POSTBUILD' in GlobalData.gCommandLineDefines.keys():\r
+ if 'POSTBUILD' in GlobalData.gCommandLineDefines:\r
self.Postbuild = GlobalData.gCommandLineDefines.get('POSTBUILD')\r
else:\r
Platform = self.Db._MapPlatform(str(self.PlatformFile))\r
# and preserve them for the rest of the main build step, because the child process environment will\r
# evaporate as soon as it exits, we cannot get it in build step.\r
#\r
- PrebuildEnvFile = os.path.join(GlobalData.gConfDirectory,'.cache','.PrebuildEnv')\r
+ PrebuildEnvFile = os.path.join(GlobalData.gConfDirectory, '.cache', '.PrebuildEnv')\r
if os.path.isfile(PrebuildEnvFile):\r
os.remove(PrebuildEnvFile)\r
if os.path.isfile(self.PlatformBuildPath):\r
f = open(PrebuildEnvFile)\r
envs = f.readlines()\r
f.close()\r
- envs = itertools.imap(lambda l: l.split('=',1), envs)\r
+ envs = itertools.imap(lambda l: l.split('=', 1), envs)\r
envs = itertools.ifilter(lambda l: len(l) == 2, envs)\r
envs = itertools.imap(lambda l: [i.strip() for i in l], envs)\r
os.environ.update(dict(envs))\r
# @param CreateDepModuleMakeFile Flag used to indicate creating makefile\r
# for dependent modules/Libraries\r
#\r
- def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
- if AutoGenObject == None:\r
+ def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False, FfsCommand={}):\r
+ if AutoGenObject is None:\r
return False\r
\r
# skip file generation for cleanxxx targets, run and fds target\r
\r
if not self.SkipAutoGen or Target == 'genmake':\r
self.Progress.Start("Generating makefile")\r
- AutoGenObject.CreateMakeFile(CreateDepsMakeFile)\r
+ AutoGenObject.CreateMakeFile(CreateDepsMakeFile, FfsCommand)\r
self.Progress.Stop("done!")\r
if Target == "genmake":\r
return True\r
EdkLogger.quiet("Building ... %s" % repr(AutoGenObject))\r
\r
BuildCommand = AutoGenObject.BuildCommand\r
- if BuildCommand == None or len(BuildCommand) == 0:\r
+ if BuildCommand is 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
try:\r
#os.rmdir(AutoGenObject.BuildDir)\r
RemoveDirectory(AutoGenObject.BuildDir, True)\r
- except WindowsError, X:\r
+ except WindowsError as X:\r
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
return True\r
\r
# for dependent modules/Libraries\r
#\r
def _Build(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
- if AutoGenObject == None:\r
+ if AutoGenObject is None:\r
return False\r
\r
# skip file generation for cleanxxx targets, run and fds target\r
EdkLogger.quiet("Building ... %s" % repr(AutoGenObject))\r
\r
BuildCommand = AutoGenObject.BuildCommand\r
- if BuildCommand == None or len(BuildCommand) == 0:\r
+ if BuildCommand is 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
try:\r
#os.rmdir(AutoGenObject.BuildDir)\r
RemoveDirectory(AutoGenObject.BuildDir, True)\r
- except WindowsError, X:\r
+ except WindowsError as X:\r
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
return True\r
\r
def _RebaseModule (self, MapBuffer, BaseAddress, ModuleList, AddrIsOffset = True, ModeIsSmm = False):\r
if ModeIsSmm:\r
AddrIsOffset = False\r
- InfFileNameList = ModuleList.keys()\r
- #InfFileNameList.sort()\r
- for InfFile in InfFileNameList:\r
+ for InfFile in ModuleList:\r
sys.stdout.write (".")\r
sys.stdout.flush()\r
ModuleInfo = ModuleList[InfFile]\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
+ for FvName in Wa.FdfProfile.FvDict:\r
FvMapBuffer = os.path.join(Wa.FvDir, FvName + '.Fv.map')\r
if not os.path.exists(FvMapBuffer):\r
continue\r
FvMap.readline()\r
for Line in FvMap:\r
MatchGuid = GuidPattern.match(Line)\r
- if MatchGuid != None:\r
+ if MatchGuid is not 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
+ MapBuffer.write(Line)\r
#\r
# Add the debug image full path.\r
#\r
MatchGuid = GuidName.match(Line)\r
- if MatchGuid != None:\r
+ if MatchGuid is not 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
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, Module.DebugDir, ImageClass)\r
- if Module.ModuleType in ['PEI_CORE', 'PEIM', 'COMBINED_PEIM_DRIVER', 'PIC_PEIM', 'RELOCATABLE_PEIM', 'DXE_CORE']:\r
+ if Module.ModuleType in [SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM, EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER, EDK_COMPONENT_TYPE_PIC_PEIM, EDK_COMPONENT_TYPE_RELOCATABLE_PEIM, SUP_MODULE_DXE_CORE]:\r
PeiModuleList[Module.MetaFile] = ImageInfo\r
PeiSize += ImageInfo.Image.Size\r
- elif Module.ModuleType in ['BS_DRIVER', 'DXE_DRIVER', 'UEFI_DRIVER']:\r
+ elif Module.ModuleType in [EDK_COMPONENT_TYPE_BS_DRIVER, SUP_MODULE_DXE_DRIVER, SUP_MODULE_UEFI_DRIVER]:\r
BtModuleList[Module.MetaFile] = ImageInfo\r
BtSize += ImageInfo.Image.Size\r
- elif Module.ModuleType in ['DXE_RUNTIME_DRIVER', 'RT_DRIVER', 'DXE_SAL_DRIVER', 'SAL_RT_DRIVER']:\r
+ elif Module.ModuleType in [SUP_MODULE_DXE_RUNTIME_DRIVER, EDK_COMPONENT_TYPE_RT_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, EDK_COMPONENT_TYPE_SAL_RT_DRIVER]:\r
RtModuleList[Module.MetaFile] = ImageInfo\r
#IPF runtime driver needs to be at 2 page alignment.\r
if IsIpfPlatform and ImageInfo.Image.Size % 0x2000 != 0:\r
ImageInfo.Image.Size = (ImageInfo.Image.Size / 0x2000 + 1) * 0x2000\r
RtSize += ImageInfo.Image.Size\r
- elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER', 'MM_STANDALONE', 'MM_CORE_STANDALONE']:\r
+ elif Module.ModuleType in [SUP_MODULE_SMM_CORE, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]:\r
SmmModuleList[Module.MetaFile] = ImageInfo\r
SmmSize += ImageInfo.Image.Size\r
- if Module.ModuleType == 'DXE_SMM_DRIVER':\r
- PiSpecVersion = '0x00000000'\r
- if 'PI_SPECIFICATION_VERSION' in Module.Module.Specification:\r
- PiSpecVersion = Module.Module.Specification['PI_SPECIFICATION_VERSION']\r
+ if Module.ModuleType == SUP_MODULE_DXE_SMM_DRIVER:\r
+ PiSpecVersion = Module.Module.Specification.get('PI_SPECIFICATION_VERSION', '0x00000000')\r
# for PI specification < PI1.1, DXE_SMM_DRIVER also runs as BOOT time driver.\r
if int(PiSpecVersion, 16) < 0x0001000A:\r
BtModuleList[Module.MetaFile] = ImageInfo\r
if OutputImageFile != '':\r
ModuleIsPatch = False\r
for Pcd in Module.ModulePcdList:\r
- if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_LIST:\r
+ if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SET:\r
ModuleIsPatch = True\r
break\r
if not ModuleIsPatch:\r
for Pcd in Module.LibraryPcdList:\r
- if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_LIST:\r
+ if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SET:\r
ModuleIsPatch = True\r
break\r
\r
self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
self.BuildReport.AddPlatformReport(Wa)\r
self.Progress.Stop("done!")\r
+\r
+ # Add ffs build to makefile\r
+ CmdListDict = {}\r
+ if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+ CmdListDict = self._GenFfsCmd()\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
+ if Ma is None:\r
continue\r
self.BuildModules.append(Ma)\r
- self._BuildPa(self.Target, Pa)\r
+ self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict)\r
\r
# Create MAP file when Load Fix Address is enabled.\r
if self.Target in ["", "all", "fds"]:\r
ModuleList = {}\r
for Pa in Wa.AutoGenObjectList:\r
for Ma in Pa.ModuleAutoGenList:\r
- if Ma == None:\r
+ if Ma is None:\r
continue\r
if not Ma.IsLibrary:\r
ModuleList[Ma.Guid.upper()] = Ma\r
\r
- MapBuffer = StringIO('')\r
+ MapBuffer = BytesIO('')\r
if self.LoadFixAddress != 0:\r
#\r
# Rebase module to the preferred memory address before GenFds\r
self.Fdf = Wa.FdfFile\r
self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
Wa.CreateMakeFile(False)\r
+ # Add ffs build to makefile\r
+ CmdListDict = None\r
+ if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+ CmdListDict = self._GenFfsCmd()\r
self.Progress.Stop("done!")\r
MaList = []\r
ExitFlag = threading.Event()\r
GlobalData.gGlobalDefines['ARCH'] = Arch\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
for Module in Pa.Platform.Modules:\r
- if self.ModuleFile.Dir == Module.Dir and self.ModuleFile.File == Module.File:\r
+ if self.ModuleFile.Dir == Module.Dir and self.ModuleFile.Name == Module.Name:\r
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
- if Ma == None: continue\r
+ if Ma is None: continue\r
MaList.append(Ma)\r
+ if Ma.CanSkipbyHash():\r
+ self.HashSkipModules.append(Ma)\r
+ continue\r
+ # Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'\r
+ if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:\r
+ # for target which must generate AutoGen code and makefile\r
+ if not self.SkipAutoGen or self.Target == 'genc':\r
+ self.Progress.Start("Generating code")\r
+ Ma.CreateCodeFile(True)\r
+ self.Progress.Stop("done!")\r
+ if self.Target == "genc":\r
+ return True\r
+ if not self.SkipAutoGen or self.Target == 'genmake':\r
+ self.Progress.Start("Generating makefile")\r
+ if CmdListDict and self.Fdf and (Module.File, Arch) in CmdListDict:\r
+ Ma.CreateMakeFile(True, CmdListDict[Module.File, Arch])\r
+ del CmdListDict[Module.File, Arch]\r
+ else:\r
+ Ma.CreateMakeFile(True)\r
+ self.Progress.Stop("done!")\r
+ if self.Target == "genmake":\r
+ return True\r
self.BuildModules.append(Ma)\r
self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
MakeStart = time.time()\r
ModuleList = {}\r
for Pa in Wa.AutoGenObjectList:\r
for Ma in Pa.ModuleAutoGenList:\r
- if Ma == None:\r
+ if Ma is None:\r
continue\r
if not Ma.IsLibrary:\r
ModuleList[Ma.Guid.upper()] = Ma\r
\r
- MapBuffer = StringIO('')\r
+ MapBuffer = BytesIO('')\r
if self.LoadFixAddress != 0:\r
#\r
# Rebase module to the preferred memory address before GenFds\r
#\r
self._SaveMapFile (MapBuffer, Wa)\r
\r
+ def _GenFfsCmd(self):\r
+ # convert dictionary of Cmd:(Inf,Arch)\r
+ # to a new dictionary of (Inf,Arch):Cmd,Cmd,Cmd...\r
+ CmdSetDict = defaultdict(set)\r
+ GenFfsDict = GenFds.GenFfsMakefile('', GlobalData.gFdfParser, self, self.ArchList, GlobalData)\r
+ for Cmd in GenFfsDict:\r
+ tmpInf, tmpArch = GenFfsDict[Cmd]\r
+ CmdSetDict[tmpInf, tmpArch].add(Cmd)\r
+ return CmdSetDict\r
+\r
## Build a platform in multi-thread mode\r
#\r
def _MultiThreadBuildPlatform(self):\r
self.BuildReport.AddPlatformReport(Wa)\r
Wa.CreateMakeFile(False)\r
\r
+ # Add ffs build to makefile\r
+ CmdListDict = None\r
+ if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+ CmdListDict = self._GenFfsCmd()\r
+\r
# multi-thread exit flag\r
ExitFlag = threading.Event()\r
ExitFlag.clear()\r
AutoGenStart = time.time()\r
GlobalData.gGlobalDefines['ARCH'] = Arch\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
- if Pa == None:\r
+ if Pa is None:\r
continue\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
+ if GlobalData.gFdfParser is not 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
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
+\r
+ if Ma is None:\r
+ continue\r
+ if Ma.CanSkipbyHash():\r
+ self.HashSkipModules.append(Ma)\r
continue\r
+\r
# Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'\r
if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:\r
# for target which must generate AutoGen code and makefile\r
continue\r
\r
if not self.SkipAutoGen or self.Target == 'genmake':\r
- Ma.CreateMakeFile(True)\r
+ if CmdListDict and self.Fdf and (Module.File, Arch) in CmdListDict:\r
+ Ma.CreateMakeFile(True, CmdListDict[Module.File, Arch])\r
+ del CmdListDict[Module.File, Arch]\r
+ else:\r
+ Ma.CreateMakeFile(True)\r
if self.Target == "genmake":\r
continue\r
self.BuildModules.append(Ma)\r
ModuleList = {}\r
for Pa in Wa.AutoGenObjectList:\r
for Ma in Pa.ModuleAutoGenList:\r
- if Ma == None:\r
+ if Ma is None:\r
continue\r
if not Ma.IsLibrary:\r
ModuleList[Ma.Guid.upper()] = Ma\r
#\r
# Rebase module to the preferred memory address before GenFds\r
#\r
- MapBuffer = StringIO('')\r
+ MapBuffer = BytesIO('')\r
if self.LoadFixAddress != 0:\r
self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
\r
toolsFile = os.path.join(FvDir, 'GuidedSectionTools.txt')\r
toolsFile = open(toolsFile, 'wt')\r
for guidedSectionTool in guidAttribs:\r
- print >> toolsFile, ' '.join(guidedSectionTool)\r
+ print(' '.join(guidedSectionTool), file=toolsFile)\r
toolsFile.close()\r
\r
## Returns the full path of the tool.\r
def CreateAsBuiltInf(self):\r
for Module in self.BuildModules:\r
Module.CreateAsBuiltInf()\r
+ for Module in self.HashSkipModules:\r
+ Module.CreateAsBuiltInf(True)\r
self.BuildModules = []\r
+ self.HashSkipModules = []\r
## Do some clean-up works when error occurred\r
def Relinquish(self):\r
OldLogLevel = EdkLogger.GetLevel()\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
+ if Utils.gFileTimeStampCache is None:\r
Utils.gFileTimeStampCache = {}\r
\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
+ if Utils.gDependencyDatabase is None:\r
Utils.gDependencyDatabase = {}\r
\r
def ParseDefines(DefineList=[]):\r
DefineDict = {}\r
- if DefineList != None:\r
+ if DefineList is not None:\r
for Define in DefineList:\r
DefineTokenList = Define.split("=", 1)\r
if not GlobalData.gMacroNamePattern.match(DefineTokenList[0]):\r
help="Using this name of SKU ID to build the platform, overriding SKUID_IDENTIFIER in DSC file.")\r
\r
Parser.add_option("-n", action="callback", type="int", dest="ThreadNumber", callback=SingleCheckCallback,\r
- help="Build the platform using multi-threaded compiler. The value overrides target.txt's MAX_CONCURRENT_THREAD_NUMBER. Less than 2 will disable multi-thread builds.")\r
+ help="Build the platform using multi-threaded compiler. The value overrides target.txt's MAX_CONCURRENT_THREAD_NUMBER. When value is set to 0, tool automatically detect number of "\\r
+ "processor threads, set value to 1 means disable multi-thread build, and set value to more than 1 means user specify the threads number to build.")\r
\r
Parser.add_option("-f", "--fdf", action="callback", type="string", dest="FdfFile", callback=SingleCheckCallback,\r
help="The name of the FDF file to use, which overrides the setting in the DSC file.")\r
Parser.add_option("-D", "--define", action="append", type="string", dest="Macros", help="Macro: \"Name [= Value]\".")\r
\r
Parser.add_option("-y", "--report-file", action="store", dest="ReportFile", help="Create/overwrite the report to the specified filename.")\r
- Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDRESS','HASH','EXECUTION_ORDER'], dest="ReportType", default=[],\r
+ Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD', 'LIBRARY', 'FLASH', 'DEPEX', 'BUILD_FLAGS', 'FIXED_ADDRESS', 'HASH', '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, HASH, 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, HASH, BUILD_FLAGS, FIXED_ADDRESS]")\r
Parser.add_option("-F", "--flag", action="store", type="string", dest="Flag",\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
Parser.add_option("--pcd", action="append", dest="OptionPcd", help="Set PCD value by command line. Format: \"PcdName=Value\" ")\r
Parser.add_option("-l", "--cmd-len", action="store", type="int", dest="CommandLength", help="Specify the maximum line length of build command. Default is 4096.")\r
-\r
+ Parser.add_option("--hash", action="store_true", dest="UseHashCache", default=False, help="Enable hash-based caching during build process.")\r
+ Parser.add_option("--binary-destination", action="store", type="string", dest="BinCacheDest", help="Generate a cache of binary files in the specified directory.")\r
+ Parser.add_option("--binary-source", action="store", type="string", dest="BinCacheSource", help="Consume a cache of binary files from the specified directory.")\r
+ Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=False, help="Enable GenFds multi thread to generate ffs file.")\r
(Opt, Args) = Parser.parse_args()\r
return (Opt, Args)\r
\r
GlobalData.gCaseInsensitive = Option.CaseInsensitive\r
\r
# Set log level\r
- if Option.verbose != None:\r
+ if Option.verbose is not None:\r
EdkLogger.SetLevel(EdkLogger.VERBOSE)\r
- elif Option.quiet != None:\r
+ elif Option.quiet is not None:\r
EdkLogger.SetLevel(EdkLogger.QUIET)\r
- elif Option.debug != None:\r
+ elif Option.debug is not None:\r
EdkLogger.SetLevel(Option.debug + 1)\r
else:\r
EdkLogger.SetLevel(EdkLogger.INFO)\r
\r
- if Option.LogFile != None:\r
+ if Option.LogFile is not None:\r
EdkLogger.SetLogFile(Option.LogFile)\r
\r
if Option.WarningAsError == True:\r
if ErrorCode != 0:\r
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
- if Option.PlatformFile != None:\r
+ if Option.PlatformFile is not None:\r
if os.path.isabs (Option.PlatformFile):\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
\r
- if Option.FdfFile != None:\r
+ if Option.FdfFile is not None:\r
if os.path.isabs (Option.FdfFile):\r
if os.path.normcase (os.path.normpath(Option.FdfFile)).find (Workspace) == 0:\r
Option.FdfFile = NormFile(os.path.normpath(Option.FdfFile), Workspace)\r
if ErrorCode != 0:\r
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
- if Option.Flag != None and Option.Flag not in ['-c', '-s']:\r
+ if Option.Flag is not 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
# All job done, no error found and no exception raised\r
#\r
BuildError = False\r
- except FatalError, X:\r
- if MyBuild != None:\r
+ except FatalError as X:\r
+ if MyBuild is not None:\r
# for multi-thread build exits safely\r
MyBuild.Relinquish()\r
- if Option != None and Option.debug != None:\r
+ if Option is not None and Option.debug is not None:\r
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
ReturnCode = X.args[0]\r
- except Warning, X:\r
+ except Warning as X:\r
# error from Fdf parser\r
- if MyBuild != None:\r
+ if MyBuild is not None:\r
# for multi-thread build exits safely\r
MyBuild.Relinquish()\r
- if Option != None and Option.debug != None:\r
+ if Option is not None and Option.debug is not None:\r
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
else:\r
EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)\r
ReturnCode = FORMAT_INVALID\r
except KeyboardInterrupt:\r
ReturnCode = ABORT_ERROR\r
- if Option != None and Option.debug != None:\r
+ if Option is not None and Option.debug is not None:\r
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
except:\r
- if MyBuild != None:\r
+ if MyBuild is not None:\r
# for multi-thread build exits safely\r
MyBuild.Relinquish()\r
\r
# try to get the meta-file from the object causing exception\r
Tb = sys.exc_info()[-1]\r
MetaFile = GlobalData.gProcessingFile\r
- while Tb != None:\r
+ while Tb is not None:\r
if 'self' in Tb.tb_frame.f_locals and hasattr(Tb.tb_frame.f_locals['self'], 'MetaFile'):\r
MetaFile = Tb.tb_frame.f_locals['self'].MetaFile\r
Tb = Tb.tb_next\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
+ if MyBuild is not None:\r
if not BuildError:\r
MyBuild.BuildReport.GenerateReport(BuildDurationStr, LogBuildTime(MyBuild.AutoGenTime), LogBuildTime(MyBuild.MakeTime), LogBuildTime(MyBuild.GenFdsTime))\r
MyBuild.Db.Close()\r