]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/build/build.py
BaseTools: Library hashing fix and optimization for --hash feature
[mirror_edk2.git] / BaseTools / Source / Python / build / build.py
index 40d4055bfc2402a02300a4cdba968959c21574f6..027061191c5eee3aa06867d83008f58a3b00ead8 100644 (file)
@@ -2,45 +2,42 @@
 # build a platform or a module\r
 #\r
 #  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<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
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ##\r
 # Import Modules\r
 #\r
+from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 import re\r
-import StringIO\r
 import sys\r
 import glob\r
 import time\r
 import platform\r
 import traceback\r
 import encodings.ascii\r
+import multiprocessing\r
 \r
 from struct import *\r
 from threading import *\r
+import threading\r
 from optparse import OptionParser\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.TargetTxtClassObject import TargetTxtClassObject\r
+from Common.ToolDefClassObject import ToolDefClassObject\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
+from Workspace.WorkspaceDatabase import WorkspaceDatabase\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 from BuildReport import BuildReport\r
 from GenPatchPcdTable.GenPatchPcdTable import *\r
@@ -48,11 +45,14 @@ from PatchPcdValue.PatchPcdValue import *
 \r
 import Common.EdkLogger\r
 import Common.GlobalData as GlobalData\r
+from GenFds.GenFds import GenFds, GenFdsApi\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 - 2014, 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
@@ -70,7 +70,7 @@ TmpTableDict = {}
 #   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
@@ -99,69 +99,25 @@ def CheckEnvVariable():
 \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
-    # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP\r
-    #\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
-        os.environ["EDK_SOURCE"] = os.environ["ECP_SOURCE"]\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=Path)\r
+            elif ' ' in Path:\r
+                EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in PACKAGES_PATH", ExtraData=Path)\r
 \r
-    #\r
-    # Unify case of characters on case-insensitive systems\r
-    #\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
-    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
-    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
-        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. Edk modules could not be built." % EdkSourceDir)\r
-        else:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE does not exist",\r
-                            ExtraData=EdkSourceDir)\r
-    elif ' ' in EdkSourceDir:\r
-        EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in EDK_SOURCE path",\r
-                        ExtraData=EdkSourceDir)\r
-    if not os.path.exists(EfiSourceDir):\r
-        if EfiSourceDir == EcpSourceDir:\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
-    elif ' ' in EfiSourceDir:\r
-        EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in EFI_SOURCE path",\r
-                        ExtraData=EfiSourceDir)\r
-\r
-    # change absolute path to relative path to WORKSPACE\r
-    if EfiSourceDir.upper().find(WorkspaceDir.upper()) != 0:\r
-        EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE is not under WORKSPACE",\r
-                        ExtraData="WORKSPACE = %s\n    EFI_SOURCE = %s" % (WorkspaceDir, EfiSourceDir))\r
-    if EdkSourceDir.upper().find(WorkspaceDir.upper()) != 0:\r
-        EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE is not under WORKSPACE",\r
-                        ExtraData="WORKSPACE = %s\n    EDK_SOURCE = %s" % (WorkspaceDir, EdkSourceDir))\r
-    if EcpSourceDir.upper().find(WorkspaceDir.upper()) != 0:\r
-        EdkLogger.error("build", PARAMETER_INVALID, "ECP_SOURCE is not under WORKSPACE",\r
-                        ExtraData="WORKSPACE = %s\n    ECP_SOURCE = %s" % (WorkspaceDir, EcpSourceDir))\r
-\r
     # check EDK_TOOLS_PATH\r
     if "EDK_TOOLS_PATH" not in os.environ:\r
         EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "Environment variable not found",\r
@@ -173,14 +129,8 @@ def CheckEnvVariable():
                         ExtraData="PATH")\r
 \r
     GlobalData.gWorkspace = WorkspaceDir\r
-    GlobalData.gEfiSource = 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
@@ -198,11 +148,12 @@ def NormFile(FilePath, Workspace):
     if os.path.isabs(FilePath):\r
         FileFullPath = os.path.normpath(FilePath)\r
     else:\r
-        FileFullPath = os.path.normpath(os.path.join(Workspace, FilePath))\r
+        FileFullPath = os.path.normpath(mws.join(Workspace, FilePath))\r
+        Workspace = mws.getWs(Workspace, FilePath)\r
 \r
     # check if the file path exists or not\r
     if not os.path.isfile(FileFullPath):\r
-        EdkLogger.error("build", FILE_NOT_FOUND, ExtraData="\t%s (Please give file in absolute path or relative to WORKSPACE)"  % FileFullPath)\r
+        EdkLogger.error("build", FILE_NOT_FOUND, ExtraData="\t%s (Please give file in absolute path or relative to WORKSPACE)" % FileFullPath)\r
 \r
     # remove workspace directory from the beginning part of the file path\r
     if Workspace[-1] in ["\\", "/"]:\r
@@ -224,8 +175,8 @@ def ReadMessage(From, To, ExitFlag):
         # read one line a time\r
         Line = From.readline()\r
         # empty string means "end"\r
-        if Line != None and Line != "":\r
-            To(Line.rstrip())\r
+        if Line is not None and Line != b"":\r
+            To(Line.rstrip().decode(encoding='utf-8', errors='ignore'))\r
         else:\r
             break\r
         if ExitFlag.isSet():\r
@@ -242,23 +193,25 @@ def ReadMessage(From, To, ExitFlag):
 # @param  WorkingDir            The directory in which the program will be running\r
 #\r
 def LaunchCommand(Command, WorkingDir):\r
+    BeginTime = time.time()\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
     # So here we may need convert command from string to list instance.\r
-    if not isinstance(Command, list):\r
-        if platform.system() != 'Windows':\r
+    if platform.system() != 'Windows':\r
+        if not isinstance(Command, list):\r
             Command = Command.split()\r
+        Command = ' '.join(Command)\r
 \r
     Proc = None\r
     EndOfProcedure = None\r
     try:\r
         # launch the command\r
-        Proc = Popen(Command, stdout=PIPE, stderr=PIPE, env=os.environ, cwd=WorkingDir, bufsize=-1)\r
+        Proc = Popen(Command, stdout=PIPE, stderr=PIPE, env=os.environ, cwd=WorkingDir, bufsize=-1, shell=True)\r
 \r
         # launch two threads to read the STDOUT and STDERR\r
         EndOfProcedure = Event()\r
@@ -279,10 +232,11 @@ def LaunchCommand(Command, WorkingDir):
         Proc.wait()\r
     except: # in case of aborting\r
         # terminate the threads redirecting the program output\r
-        if EndOfProcedure != None:\r
+        EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\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
@@ -293,9 +247,18 @@ def LaunchCommand(Command, WorkingDir):
 \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
+        if os.path.isfile(RespFile):\r
+            f = open(RespFile)\r
+            RespContent = f.read()\r
+            f.close()\r
+            EdkLogger.info(RespContent)\r
+\r
         EdkLogger.error("build", COMMAND_FAILURE, ExtraData="%s [%s]" % (Command, WorkingDir))\r
+    return "%dms" % (int(round((time.time() - BeginTime) * 1000)))\r
 \r
 ## The smallest unit that can be built in multi-thread build mode\r
 #\r
@@ -346,7 +309,8 @@ class BuildUnit:
     #   @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
@@ -409,19 +373,19 @@ class PlatformMakeUnit(BuildUnit):
 #\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
@@ -472,7 +436,7 @@ class BuildTask:
 \r
                 # get all pending tasks\r
                 BuildTask._PendingQueueLock.acquire()\r
-                BuildObjectList = BuildTask._PendingQueue.keys()\r
+                BuildObjectList = list(BuildTask._PendingQueue.keys())\r
                 #\r
                 # check if their dependency is resolved, and if true, move them\r
                 # into ready queue\r
@@ -493,8 +457,7 @@ class BuildTask:
                     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
@@ -514,12 +477,12 @@ class BuildTask:
             # 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
+            # TRICK: hide the output of threads left running, so that the user can\r
             #        catch the error message easily\r
             #\r
             EdkLogger.SetLevel(EdkLogger.ERROR)\r
@@ -604,7 +567,7 @@ class BuildTask:
         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
@@ -630,7 +593,7 @@ class BuildTask:
     #\r
     def AddDependency(self, Dependency):\r
         for Dep in Dependency:\r
-            if not Dep.BuildObject.IsBinaryModule:\r
+            if not Dep.BuildObject.IsBinaryModule and not Dep.BuildObject.CanSkipbyHash():\r
                 self.DependencyList.append(BuildTask.New(Dep))    # BuildTask list\r
 \r
     ## The thread wrapper of LaunchCommand function\r
@@ -640,11 +603,16 @@ class BuildTask:
     #\r
     def _CommandThread(self, Command, WorkingDir):\r
         try:\r
-            LaunchCommand(Command, WorkingDir)\r
+            self.BuildItem.BuildObject.BuildTime = LaunchCommand(Command, WorkingDir)\r
             self.CompleteFlag = True\r
+\r
+            # Run hash operation post dependency, to account for libs\r
+            if GlobalData.gUseHashCache and self.BuildItem.BuildObject.IsLibrary:\r
+                HashFile = path.join(self.BuildItem.BuildObject.BuildDir, self.BuildItem.BuildObject.Name + ".hash")\r
+                SaveFileOnChange(HashFile, self.BuildItem.BuildObject.GenModuleHash(), True)\r
         except:\r
             #\r
-            # TRICK: hide the output of threads left runing, so that the user can\r
+            # TRICK: hide the output of threads left running, so that the user can\r
             #        catch the error message easily\r
             #\r
             if not BuildTask._ErrorFlag.isSet():\r
@@ -657,6 +625,8 @@ class BuildTask:
             BuildTask._ErrorFlag.set()\r
             BuildTask._ErrorMessage = "%s broken\n    %s [%s]" % \\r
                                       (threading.currentThread().getName(), Command, WorkingDir)\r
+        if self.BuildItem.BuildObject in GlobalData.gModuleBuildTracking and not BuildTask._ErrorFlag.isSet():\r
+            GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject] = True\r
         # indicate there's a thread is available for another build task\r
         BuildTask._RunningQueueLock.acquire()\r
         BuildTask._RunningQueue.pop(self.BuildItem)\r
@@ -694,7 +664,7 @@ class PeImageInfo():
         self.OutputDir        = OutputDir\r
         self.DebugDir         = DebugDir\r
         self.Image            = ImageClass\r
-        self.Image.Size       = (self.Image.Size / 0x1000 + 1) * 0x1000\r
+        self.Image.Size       = (self.Image.Size // 0x1000 + 1) * 0x1000\r
 \r
 ## The class implementing the EDK2 build process\r
 #\r
@@ -733,13 +703,51 @@ class Build():
         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.TargetTxt      = TargetTxtClassObject()\r
         self.ToolDef        = ToolDefClassObject()\r
+        self.AutoGenTime    = 0\r
+        self.MakeTime       = 0\r
+        self.GenFdsTime     = 0\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
+        GlobalData.gDisableIncludePathCheck = BuildOptions.DisableIncludePathCheck\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
@@ -748,37 +756,63 @@ class Build():
             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
+                ConfDirectoryPath = mws.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
+            if "CONF_PATH" in os.environ:\r
+                ConfDirectoryPath = os.path.normcase(os.path.normpath(os.environ["CONF_PATH"]))\r
+            else:\r
+                # Get standard WORKSPACE/Conf use the absolute path to the WORKSPACE/Conf\r
+                ConfDirectoryPath = mws.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(GlobalData.gDatabasePath, self.Reparse)\r
+        self.Db = WorkspaceDatabase()\r
         self.BuildDatabase = self.Db.BuildObject\r
         self.Platform = None\r
+        self.ToolChainFamily = None\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
+        if BuildOptions.CommandLength:\r
+            GlobalData.gCommandMaxLength = BuildOptions.CommandLength\r
 \r
         # print dot character during doing some time-consuming work\r
         self.Progress = Utils.Progressor()\r
-\r
-        self.InitBuild()\r
-\r
         # print current build environment and configuration\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
+        if "PACKAGES_PATH" in os.environ:\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" % ("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
+            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
+        if "PYTHON3_ENABLE" in os.environ:\r
+            PYTHON3_ENABLE = os.environ["PYTHON3_ENABLE"]\r
+            if PYTHON3_ENABLE != "TRUE":\r
+                PYTHON3_ENABLE = "FALSE"\r
+            EdkLogger.quiet("%-16s = %s" % ("PYTHON3_ENABLE", PYTHON3_ENABLE))\r
+        if "PYTHON_COMMAND" in os.environ:\r
+            EdkLogger.quiet("%-16s = %s" % ("PYTHON_COMMAND", os.environ["PYTHON_COMMAND"]))\r
+        self.InitPreBuild()\r
+        self.InitPostBuild()\r
+        if self.Prebuild:\r
+            EdkLogger.quiet("%-16s = %s" % ("PREBUILD", self.Prebuild))\r
+        if self.Postbuild:\r
+            EdkLogger.quiet("%-16s = %s" % ("POSTBUILD", self.Postbuild))\r
+        if self.Prebuild:\r
+            self.LaunchPrebuild()\r
+            self.TargetTxt = TargetTxtClassObject()\r
+            self.ToolDef   = ToolDefClassObject()\r
+        if not (self.LaunchPrebuildFlag and os.path.exists(self.PlatformBuildPath)):\r
+            self.InitBuild()\r
 \r
         EdkLogger.info("")\r
-\r
         os.chdir(self.WorkspaceDir)\r
 \r
     ## Load configuration\r
@@ -793,10 +827,10 @@ class Build():
         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
+            ToolDefinitionFile = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
             if ToolDefinitionFile == '':\r
                 ToolDefinitionFile = gToolsDefinition\r
-                ToolDefinitionFile = os.path.normpath(os.path.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
+                ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
             if os.path.isfile(ToolDefinitionFile) == True:\r
                 StatusCode = self.ToolDef.LoadToolDefFile(ToolDefinitionFile)\r
             else:\r
@@ -806,17 +840,17 @@ class Build():
 \r
         # if no ARCH given in command line, get it from target.txt\r
         if not self.ArchList:\r
-            self.ArchList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET_ARCH]\r
+            self.ArchList = self.TargetTxt.TargetTxtDictionary[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 not self.BuildTargetList:\r
-            self.BuildTargetList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]\r
+            self.BuildTargetList = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TARGET]\r
 \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
+            self.ToolChainList = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TOOL_CHAIN_TAG]\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
@@ -833,18 +867,32 @@ class Build():
         else:\r
             self.ToolChainList = NewToolChainList\r
 \r
-        if self.ThreadNumber == None:\r
-            self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
+        ToolChainFamily = []\r
+        ToolDefinition = self.ToolDef.ToolsDefTxtDatabase\r
+        for Tool in self.ToolChainList:\r
+            if TAB_TOD_DEFINES_FAMILY not in ToolDefinition or Tool not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
+               or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool]:\r
+                EdkLogger.warn("build", "No tool chain family found in configuration for %s. Default to MSFT." % Tool)\r
+                ToolChainFamily.append(TAB_COMPILER_MSFT)\r
+            else:\r
+                ToolChainFamily.append(ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool])\r
+        self.ToolChainFamily = ToolChainFamily\r
+\r
+        if self.ThreadNumber is None:\r
+            self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
             if self.ThreadNumber == '':\r
                 self.ThreadNumber = 0\r
             else:\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
+            PlatformFile = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_ACTIVE_PLATFORM]\r
             if not PlatformFile:\r
                 # Try to find one in current directory\r
                 WorkingDirectory = os.getcwd()\r
@@ -875,8 +923,258 @@ class Build():
         if ErrorCode != 0:\r
             EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
 \r
-        # create metafile database\r
-        self.Db.InitDatabase()\r
+\r
+    def InitPreBuild(self):\r
+        self.LoadConfiguration()\r
+        ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False)\r
+        if ErrorCode != 0:\r
+            EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
+        if self.BuildTargetList:\r
+            GlobalData.gGlobalDefines['TARGET'] = self.BuildTargetList[0]\r
+        if self.ArchList:\r
+            GlobalData.gGlobalDefines['ARCH'] = self.ArchList[0]\r
+        if self.ToolChainList:\r
+            GlobalData.gGlobalDefines['TOOLCHAIN'] = self.ToolChainList[0]\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:\r
+            self.Prebuild   = GlobalData.gCommandLineDefines.get('PREBUILD')\r
+        else:\r
+            self.Db_Flag = True\r
+            Platform = self.Db.MapPlatform(str(self.PlatformFile))\r
+            self.Prebuild = str(Platform.Prebuild)\r
+        if self.Prebuild:\r
+            PrebuildList = []\r
+            #\r
+            # Evaluate all arguments and convert arguments that are WORKSPACE\r
+            # relative paths to absolute paths.  Filter arguments that look like\r
+            # flags or do not follow the file/dir naming rules to avoid false\r
+            # positives on this conversion.\r
+            #\r
+            for Arg in self.Prebuild.split():\r
+                #\r
+                # Do not modify Arg if it looks like a flag or an absolute file path\r
+                #\r
+                if Arg.startswith('-')  or os.path.isabs(Arg):\r
+                    PrebuildList.append(Arg)\r
+                    continue\r
+                #\r
+                # Do not modify Arg if it does not look like a Workspace relative\r
+                # path that starts with a valid package directory name\r
+                #\r
+                if not Arg[0].isalpha() or os.path.dirname(Arg) == '':\r
+                    PrebuildList.append(Arg)\r
+                    continue\r
+                #\r
+                # If Arg looks like a WORKSPACE relative path, then convert to an\r
+                # absolute path and check to see if the file exists.\r
+                #\r
+                Temp = mws.join(self.WorkspaceDir, Arg)\r
+                if os.path.isfile(Temp):\r
+                    Arg = Temp\r
+                PrebuildList.append(Arg)\r
+            self.Prebuild       = ' '.join(PrebuildList)\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:\r
+            self.Postbuild = GlobalData.gCommandLineDefines.get('POSTBUILD')\r
+        else:\r
+            Platform = self.Db.MapPlatform(str(self.PlatformFile))\r
+            self.Postbuild = str(Platform.Postbuild)\r
+        if self.Postbuild:\r
+            PostbuildList = []\r
+            #\r
+            # Evaluate all arguments and convert arguments that are WORKSPACE\r
+            # relative paths to absolute paths.  Filter arguments that look like\r
+            # flags or do not follow the file/dir naming rules to avoid false\r
+            # positives on this conversion.\r
+            #\r
+            for Arg in self.Postbuild.split():\r
+                #\r
+                # Do not modify Arg if it looks like a flag or an absolute file path\r
+                #\r
+                if Arg.startswith('-')  or os.path.isabs(Arg):\r
+                    PostbuildList.append(Arg)\r
+                    continue\r
+                #\r
+                # Do not modify Arg if it does not look like a Workspace relative\r
+                # path that starts with a valid package directory name\r
+                #\r
+                if not Arg[0].isalpha() or os.path.dirname(Arg) == '':\r
+                    PostbuildList.append(Arg)\r
+                    continue\r
+                #\r
+                # If Arg looks like a WORKSPACE relative path, then convert to an\r
+                # absolute path and check to see if the file exists.\r
+                #\r
+                Temp = mws.join(self.WorkspaceDir, Arg)\r
+                if os.path.isfile(Temp):\r
+                    Arg = Temp\r
+                PostbuildList.append(Arg)\r
+            self.Postbuild       = ' '.join(PostbuildList)\r
+            self.Postbuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList, self.PlatformFile, self.Target)\r
+\r
+    def PassCommandOption(self, BuildTarget, TargetArch, ToolChain, PlatformFile, Target):\r
+        BuildStr = ''\r
+        if GlobalData.gCommand and isinstance(GlobalData.gCommand, list):\r
+            BuildStr += ' ' + ' '.join(GlobalData.gCommand)\r
+        TargetFlag = False\r
+        ArchFlag = False\r
+        ToolChainFlag = False\r
+        PlatformFileFlag = False\r
+\r
+        if GlobalData.gOptions and not GlobalData.gOptions.BuildTarget:\r
+            TargetFlag = True\r
+        if GlobalData.gOptions and not GlobalData.gOptions.TargetArch:\r
+            ArchFlag = True\r
+        if GlobalData.gOptions and not GlobalData.gOptions.ToolChain:\r
+            ToolChainFlag = True\r
+        if GlobalData.gOptions and not GlobalData.gOptions.PlatformFile:\r
+            PlatformFileFlag = True\r
+\r
+        if TargetFlag and BuildTarget:\r
+            if isinstance(BuildTarget, list) or isinstance(BuildTarget, tuple):\r
+                BuildStr += ' -b ' + ' -b '.join(BuildTarget)\r
+            elif isinstance(BuildTarget, str):\r
+                BuildStr += ' -b ' + BuildTarget\r
+        if ArchFlag and TargetArch:\r
+            if isinstance(TargetArch, list) or isinstance(TargetArch, tuple):\r
+                BuildStr += ' -a ' + ' -a '.join(TargetArch)\r
+            elif isinstance(TargetArch, str):\r
+                BuildStr += ' -a ' + TargetArch\r
+        if ToolChainFlag and ToolChain:\r
+            if isinstance(ToolChain, list) or isinstance(ToolChain, tuple):\r
+                BuildStr += ' -t ' + ' -t '.join(ToolChain)\r
+            elif isinstance(ToolChain, str):\r
+                BuildStr += ' -t ' + ToolChain\r
+        if PlatformFileFlag and PlatformFile:\r
+            if isinstance(PlatformFile, list) or isinstance(PlatformFile, tuple):\r
+                BuildStr += ' -p ' + ' -p '.join(PlatformFile)\r
+            elif isinstance(PlatformFile, str):\r
+                BuildStr += ' -p' + PlatformFile\r
+        BuildStr += ' --conf=' + GlobalData.gConfDirectory\r
+        if Target:\r
+            BuildStr += ' ' + Target\r
+\r
+        return BuildStr\r
+\r
+    def LaunchPrebuild(self):\r
+        if self.Prebuild:\r
+            EdkLogger.info("\n- Prebuild Start -\n")\r
+            self.LaunchPrebuildFlag = True\r
+            #\r
+            # The purpose of .PrebuildEnv file is capture environment variable settings set by the prebuild script\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
+            if os.path.isfile(PrebuildEnvFile):\r
+                os.remove(PrebuildEnvFile)\r
+            if os.path.isfile(self.PlatformBuildPath):\r
+                os.remove(self.PlatformBuildPath)\r
+            if sys.platform == "win32":\r
+                args = ' && '.join((self.Prebuild, 'set > ' + PrebuildEnvFile))\r
+                Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)\r
+            else:\r
+                args = ' && '.join((self.Prebuild, 'env > ' + PrebuildEnvFile))\r
+                Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)\r
+\r
+            # launch two threads to read the STDOUT and STDERR\r
+            EndOfProcedure = Event()\r
+            EndOfProcedure.clear()\r
+            if Process.stdout:\r
+                StdOutThread = Thread(target=ReadMessage, args=(Process.stdout, EdkLogger.info, EndOfProcedure))\r
+                StdOutThread.setName("STDOUT-Redirector")\r
+                StdOutThread.setDaemon(False)\r
+                StdOutThread.start()\r
+\r
+            if Process.stderr:\r
+                StdErrThread = Thread(target=ReadMessage, args=(Process.stderr, EdkLogger.quiet, EndOfProcedure))\r
+                StdErrThread.setName("STDERR-Redirector")\r
+                StdErrThread.setDaemon(False)\r
+                StdErrThread.start()\r
+            # waiting for program exit\r
+            Process.wait()\r
+\r
+            if Process.stdout:\r
+                StdOutThread.join()\r
+            if Process.stderr:\r
+                StdErrThread.join()\r
+            if Process.returncode != 0 :\r
+                EdkLogger.error("Prebuild", PREBUILD_ERROR, 'Prebuild process is not success!')\r
+\r
+            if os.path.exists(PrebuildEnvFile):\r
+                f = open(PrebuildEnvFile)\r
+                envs = f.readlines()\r
+                f.close()\r
+                envs = [l.split("=", 1) for l in envs ]\r
+                envs = [[I.strip() for I in item] for item in envs if len(item) == 2]\r
+                os.environ.update(dict(envs))\r
+            EdkLogger.info("\n- Prebuild Done -\n")\r
+\r
+    def LaunchPostbuild(self):\r
+        if self.Postbuild:\r
+            EdkLogger.info("\n- Postbuild Start -\n")\r
+            if sys.platform == "win32":\r
+                Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)\r
+            else:\r
+                Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)\r
+            # launch two threads to read the STDOUT and STDERR\r
+            EndOfProcedure = Event()\r
+            EndOfProcedure.clear()\r
+            if Process.stdout:\r
+                StdOutThread = Thread(target=ReadMessage, args=(Process.stdout, EdkLogger.info, EndOfProcedure))\r
+                StdOutThread.setName("STDOUT-Redirector")\r
+                StdOutThread.setDaemon(False)\r
+                StdOutThread.start()\r
+\r
+            if Process.stderr:\r
+                StdErrThread = Thread(target=ReadMessage, args=(Process.stderr, EdkLogger.quiet, EndOfProcedure))\r
+                StdErrThread.setName("STDERR-Redirector")\r
+                StdErrThread.setDaemon(False)\r
+                StdErrThread.start()\r
+            # waiting for program exit\r
+            Process.wait()\r
+\r
+            if Process.stdout:\r
+                StdOutThread.join()\r
+            if Process.stderr:\r
+                StdErrThread.join()\r
+            if Process.returncode != 0 :\r
+                EdkLogger.error("Postbuild", POSTBUILD_ERROR, 'Postbuild process is not success!')\r
+            EdkLogger.info("\n- Postbuild Done -\n")\r
+\r
+    ## Error handling for hash feature\r
+    #\r
+    # On BuildTask error, iterate through the Module Build tracking\r
+    # dictionary to determine wheather a module failed to build. Invalidate\r
+    # the hash associated with that module by removing it from storage.\r
+    #\r
+    #\r
+    def invalidateHash(self):\r
+        # GlobalData.gModuleBuildTracking contains only modules that cannot be skipped by hash\r
+        for moduleAutoGenObj in GlobalData.gModuleBuildTracking.keys():\r
+            # False == FAIL : True == Success\r
+            # Skip invalidating for Successful module builds\r
+            if GlobalData.gModuleBuildTracking[moduleAutoGenObj] == True:\r
+                continue\r
+\r
+            # The module failed to build or failed to start building, from this point on\r
+\r
+            # Remove .hash from build\r
+            if GlobalData.gUseHashCache:\r
+                ModuleHashFile = path.join(moduleAutoGenObj.BuildDir, moduleAutoGenObj.Name + ".hash")\r
+                if os.path.exists(ModuleHashFile):\r
+                    os.remove(ModuleHashFile)\r
+\r
+            # Remove .hash file from cache\r
+            if GlobalData.gBinCacheDest:\r
+                FileDir = path.join(GlobalData.gBinCacheDest, moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseName)\r
+                HashFile = path.join(FileDir, moduleAutoGenObj.Name + '.hash')\r
+                if os.path.exists(HashFile):\r
+                    os.remove(HashFile)\r
 \r
     ## Build a module or platform\r
     #\r
@@ -894,8 +1192,8 @@ class Build():
     #   @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
@@ -910,7 +1208,7 @@ class Build():
 \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
@@ -923,7 +1221,7 @@ class Build():
             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
@@ -932,11 +1230,6 @@ class Build():
 \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, GlobalData.gGlobalDefines['ARCH']))\r
@@ -998,7 +1291,7 @@ class Build():
             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
@@ -1019,7 +1312,7 @@ class Build():
     #                                       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
@@ -1048,16 +1341,25 @@ class Build():
             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
                                 (AutoGenObject.BuildTarget, AutoGenObject.ToolChain, AutoGenObject.Arch),\r
                             ExtraData=str(AutoGenObject))\r
 \r
+        # build modules\r
+        if BuildModule:\r
+            if Target != 'fds':\r
+                BuildCommand = BuildCommand + [Target]\r
+            AutoGenObject.BuildTime = LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+            self.CreateAsBuiltInf()\r
+            return True\r
+\r
         # genfds\r
         if Target == 'fds':\r
-            LaunchCommand(AutoGenObject.GenFdsCommand, AutoGenObject.MakeFileDir)\r
+            if GenFdsApi(AutoGenObject.GenFdsCommandDict, self.Db):\r
+                EdkLogger.error("build", COMMAND_FAILURE)\r
             return True\r
 \r
         # run\r
@@ -1068,13 +1370,6 @@ class Build():
             LaunchCommand(Command, RunDir)\r
             return True\r
 \r
-        # build modules\r
-        BuildCommand = BuildCommand + [Target]\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
@@ -1087,7 +1382,7 @@ class Build():
             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
@@ -1096,9 +1391,7 @@ class Build():
     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
@@ -1112,21 +1405,21 @@ class Build():
                 # Update Image to new BaseAddress by GenFw tool\r
                 #\r
                 LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)\r
-                LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleDebugImage],  ModuleInfo.DebugDir)\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", ModuleOutputImage], ModuleInfo.OutputDir)\r
-                LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleDebugImage],  ModuleInfo.DebugDir)\r
+                LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)\r
             #\r
-            # Collect funtion address from Map file\r
+            # Collect function address from Map file\r
             #\r
             ImageMapTable = ModuleOutputImage.replace('.efi', '.map')\r
             FunctionList = []\r
             if os.path.exists(ImageMapTable):\r
                 OrigImageBaseAddress = 0\r
-                ImageMap = open (ImageMapTable, 'r')\r
+                ImageMap = open(ImageMapTable, 'r')\r
                 for LinStr in ImageMap:\r
                     if len (LinStr.strip()) == 0:\r
                         continue\r
@@ -1139,25 +1432,21 @@ class Build():
 \r
                     StrList = LinStr.split()\r
                     if len (StrList) > 4:\r
-                        if StrList[3] == 'f' or StrList[3] =='F':\r
+                        if StrList[3] == 'f' or StrList[3] == 'F':\r
                             Name = StrList[1]\r
                             RelativeAddress = int (StrList[2], 16) - OrigImageBaseAddress\r
                             FunctionList.append ((Name, RelativeAddress))\r
-                            if ModuleInfo.Arch == 'IPF' and Name.endswith('_ModuleEntryPoint'):\r
-                                #\r
-                                # Get the real entry point address for IPF image.\r
-                                #\r
-                                ModuleInfo.Image.EntryPoint = RelativeAddress\r
+\r
                 ImageMap.close()\r
             #\r
             # Add general information.\r
             #\r
             if ModeIsSmm:\r
-                MapBuffer.write('\n\n%s (Fixed SMRAM Offset,   BaseAddress=0x%010X,  EntryPoint=0x%010X)\n' % (ModuleName, BaseAddress, BaseAddress + ModuleInfo.Image.EntryPoint))\r
+                MapBuffer.append('\n\n%s (Fixed SMRAM Offset,   BaseAddress=0x%010X,  EntryPoint=0x%010X)\n' % (ModuleName, BaseAddress, BaseAddress + ModuleInfo.Image.EntryPoint))\r
             elif AddrIsOffset:\r
-                MapBuffer.write('\n\n%s (Fixed Memory Offset,  BaseAddress=-0x%010X, EntryPoint=-0x%010X)\n' % (ModuleName, 0 - BaseAddress, 0 - (BaseAddress + ModuleInfo.Image.EntryPoint)))\r
+                MapBuffer.append('\n\n%s (Fixed Memory Offset,  BaseAddress=-0x%010X, EntryPoint=-0x%010X)\n' % (ModuleName, 0 - BaseAddress, 0 - (BaseAddress + ModuleInfo.Image.EntryPoint)))\r
             else:\r
-                MapBuffer.write('\n\n%s (Fixed Memory Address, BaseAddress=0x%010X,  EntryPoint=0x%010X)\n' % (ModuleName, BaseAddress, BaseAddress + ModuleInfo.Image.EntryPoint))\r
+                MapBuffer.append('\n\n%s (Fixed Memory Address, BaseAddress=0x%010X,  EntryPoint=0x%010X)\n' % (ModuleName, BaseAddress, BaseAddress + ModuleInfo.Image.EntryPoint))\r
             #\r
             # Add guid and general seciton section.\r
             #\r
@@ -1169,21 +1458,21 @@ class Build():
                 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.append('(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.append('(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
+            MapBuffer.append('(IMAGE=%s)\n\n' % (ModuleDebugImage))\r
             #\r
-            # Add funtion address\r
+            # Add function address\r
             #\r
             for Function in FunctionList:\r
                 if AddrIsOffset:\r
-                    MapBuffer.write('  -0x%010X    %s\n' % (0 - (BaseAddress + Function[1]), Function[0]))\r
+                    MapBuffer.append('  -0x%010X    %s\n' % (0 - (BaseAddress + Function[1]), Function[0]))\r
                 else:\r
-                    MapBuffer.write('  0x%010X    %s\n' % (BaseAddress + Function[1], Function[0]))\r
+                    MapBuffer.append('  0x%010X    %s\n' % (BaseAddress + Function[1], Function[0]))\r
             ImageMap.close()\r
 \r
             #\r
@@ -1199,7 +1488,7 @@ class Build():
             # 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
@@ -1211,22 +1500,22 @@ class Build():
                 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.append(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
+                            MapBuffer.append('(IMAGE=%s)\n' % (os.path.join(ModuleList[GuidString.upper()].DebugDir, ModuleList[GuidString.upper()].Name + '.efi')))\r
 \r
                 FvMap.close()\r
 \r
@@ -1245,9 +1534,6 @@ class Build():
         RtSize  = 0\r
         # reserve 4K size in SMRAM to make SMM module address not from 0.\r
         SmmSize = 0x1000\r
-        IsIpfPlatform = False\r
-        if 'IPF' in self.ArchList:\r
-            IsIpfPlatform = True\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
@@ -1263,25 +1549,20 @@ class Build():
                     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']:\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
@@ -1294,12 +1575,12 @@ class Build():
             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
@@ -1322,10 +1603,6 @@ class Build():
             TopMemoryAddress = self.LoadFixAddress\r
             if TopMemoryAddress < RtSize + BtSize + PeiSize:\r
                 EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is too low to load driver")\r
-            # Make IPF runtime driver at 2 page alignment.\r
-            if IsIpfPlatform:\r
-                ReservedRuntimeMemorySize = TopMemoryAddress % 0x2000\r
-                RtSize = RtSize + ReservedRuntimeMemorySize\r
 \r
         #\r
         # Patch FixAddress related PCDs into EFI image\r
@@ -1344,21 +1621,21 @@ class Build():
             for PcdInfo in PcdTable:\r
                 ReturnValue = 0\r
                 if PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE:\r
-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE_DATA_TYPE, str (PeiSize/0x1000))\r
+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE_DATA_TYPE, str (PeiSize // 0x1000))\r
                 elif PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE:\r
-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE_DATA_TYPE, str (BtSize/0x1000))\r
+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE_DATA_TYPE, str (BtSize // 0x1000))\r
                 elif PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE:\r
-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE_DATA_TYPE, str (RtSize/0x1000))\r
+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE_DATA_TYPE, str (RtSize // 0x1000))\r
                 elif PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE and len (SmmModuleList) > 0:\r
-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE_DATA_TYPE, str (SmmSize/0x1000))\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
-        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
+        MapBuffer.append('PEI_CODE_PAGE_NUMBER      = 0x%x\n' % (PeiSize // 0x1000))\r
+        MapBuffer.append('BOOT_CODE_PAGE_NUMBER     = 0x%x\n' % (BtSize // 0x1000))\r
+        MapBuffer.append('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
+            MapBuffer.append('SMM_CODE_PAGE_NUMBER      = 0x%x\n' % (SmmSize // 0x1000))\r
 \r
         PeiBaseAddr = TopMemoryAddress - RtSize - BtSize\r
         BtBaseAddr  = TopMemoryAddress - RtSize\r
@@ -1367,8 +1644,8 @@ class Build():
         self._RebaseModule (MapBuffer, PeiBaseAddr, PeiModuleList, TopMemoryAddress == 0)\r
         self._RebaseModule (MapBuffer, BtBaseAddr, BtModuleList, TopMemoryAddress == 0)\r
         self._RebaseModule (MapBuffer, RtBaseAddr, RtModuleList, TopMemoryAddress == 0)\r
-        self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset = False, ModeIsSmm = True)\r
-        MapBuffer.write('\n\n')\r
+        self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset=False, ModeIsSmm=True)\r
+        MapBuffer.append('\n\n')\r
         sys.stdout.write ("\n")\r
         sys.stdout.flush()\r
 \r
@@ -1382,20 +1659,23 @@ class Build():
         #\r
         # Save address map into MAP file.\r
         #\r
-        SaveFileOnChange(MapFilePath, MapBuffer.getvalue(), False)\r
-        MapBuffer.close()\r
+        SaveFileOnChange(MapFilePath, ''.join(MapBuffer), False)\r
         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.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
+        SaveFileOnChange(self.PlatformBuildPath, '# DO NOT EDIT \n# FILE auto-generated\n', False)\r
         for BuildTarget in self.BuildTargetList:\r
             GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
+            index = 0\r
             for ToolChain in self.ToolChainList:\r
                 GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
                 GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
+                GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
+                index += 1\r
                 Wa = WorkspaceAutoGen(\r
                         self.WorkspaceDir,\r
                         self.PlatformFile,\r
@@ -1417,16 +1697,22 @@ class Build():
                 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(Wa.ArchList)\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
@@ -1443,23 +1729,22 @@ class Build():
                     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 = []\r
                     if self.LoadFixAddress != 0:\r
                         #\r
                         # Rebase module to the preferred memory address before GenFds\r
                         #\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 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
@@ -1474,9 +1759,13 @@ class Build():
     def _BuildModule(self):\r
         for BuildTarget in self.BuildTargetList:\r
             GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
+            index = 0\r
             for ToolChain in self.ToolChainList:\r
+                WorkspaceAutoGenTime = time.time()\r
                 GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
                 GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
+                GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
+                index += 1\r
                 #\r
                 # module build needs platform build information, so get platform\r
                 # AutoGen first\r
@@ -1502,16 +1791,83 @@ class Build():
                 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(Wa.ArchList)\r
                 self.Progress.Stop("done!")\r
                 MaList = []\r
+                ExitFlag = threading.Event()\r
+                ExitFlag.clear()\r
+                self.AutoGenTime += int(round((time.time() - WorkspaceAutoGenTime)))\r
                 for Arch in Wa.ArchList:\r
+                    AutoGenStart = time.time()\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.BuildModules.append(Ma)\r
-                    if not Ma.IsBinaryModule:\r
-                        self._Build(self.Target, Ma, BuildModule=True)\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.Name == Module.Name:\r
+                            Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
+                            if Ma is None:\r
+                                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
+                            # Initialize all modules in tracking to False (FAIL)\r
+                            if Ma not in GlobalData.gModuleBuildTracking:\r
+                                GlobalData.gModuleBuildTracking[Ma] = False\r
+                    self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
+                    MakeStart = time.time()\r
+                    for Ma in self.BuildModules:\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
+                            ExitFlag.set()\r
+                            BuildTask.WaitForComplete()\r
+                            self.invalidateHash()\r
+                            Pa.CreateMakeFile(False)\r
+                            EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
+                        # Start task scheduler\r
+                        if not BuildTask.IsOnGoing():\r
+                            BuildTask.StartScheduler(self.ThreadNumber, ExitFlag)\r
+\r
+                    # in case there's an interruption. we need a full version of makefile for platform\r
+                    Pa.CreateMakeFile(False)\r
+                    if BuildTask.HasError():\r
+                        self.invalidateHash()\r
+                        EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
+                    self.MakeTime += int(round((time.time() - MakeStart)))\r
+\r
+                MakeContiue = time.time()\r
+                ExitFlag.set()\r
+                BuildTask.WaitForComplete()\r
+                self.CreateAsBuiltInf()\r
+                self.MakeTime += int(round((time.time() - MakeContiue)))\r
+                if BuildTask.HasError():\r
+                    self.invalidateHash()\r
+                    EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
 \r
                 self.BuildReport.AddPlatformReport(Wa, MaList)\r
                 if MaList == []:\r
@@ -1520,7 +1876,7 @@ class Build():
                                 BUILD_ERROR,\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
+                                " given in the same as in [%s]" % \\r
                                     (', '.join(Wa.ArchList), self.PlatformFile),\r
                                 ExtraData=self.ModuleFile\r
                                 )\r
@@ -1538,21 +1894,23 @@ class Build():
                     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 = []\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 FDS again for the updated EFI image\r
+                    #\r
+                    GenFdsStart = time.time()\r
+                    self._Build("fds", Wa)\r
+                    self.GenFdsTime += int(round((time.time() - GenFdsStart)))\r
                     #\r
                     # Create MAP file for all platform FVs after GenFds.\r
                     #\r
@@ -1562,14 +1920,29 @@ class Build():
                     #\r
                     self._SaveMapFile (MapBuffer, Wa)\r
 \r
+    def _GenFfsCmd(self,ArchList):\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, 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
+        SaveFileOnChange(self.PlatformBuildPath, '# DO NOT EDIT \n# FILE auto-generated\n', False)\r
         for BuildTarget in self.BuildTargetList:\r
             GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
+            index = 0\r
             for ToolChain in self.ToolChainList:\r
+                WorkspaceAutoGenTime = time.time()\r
                 GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
                 GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
+                GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
+                index += 1\r
                 Wa = WorkspaceAutoGen(\r
                         self.WorkspaceDir,\r
                         self.PlatformFile,\r
@@ -1592,19 +1965,26 @@ class Build():
                 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(Wa.ArchList)\r
+\r
                 # multi-thread exit flag\r
                 ExitFlag = threading.Event()\r
                 ExitFlag.clear()\r
+                self.AutoGenTime += int(round((time.time() - WorkspaceAutoGenTime)))\r
                 for Arch in Wa.ArchList:\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
@@ -1613,9 +1993,13 @@ class Build():
                     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
@@ -1625,12 +2009,20 @@ class Build():
                                 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
+                        # Initialize all modules in tracking to False (FAIL)\r
+                        if Ma not in GlobalData.gModuleBuildTracking:\r
+                            GlobalData.gModuleBuildTracking[Ma] = False\r
                     self.Progress.Stop("done!")\r
-\r
+                    self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
+                    MakeStart = time.time()\r
                     for Ma in self.BuildModules:\r
                         # Generate build task for the module\r
                         if not Ma.IsBinaryModule:\r
@@ -1640,6 +2032,7 @@ class Build():
                             # we need a full version of makefile for platform\r
                             ExitFlag.set()\r
                             BuildTask.WaitForComplete()\r
+                            self.invalidateHash()\r
                             Pa.CreateMakeFile(False)\r
                             EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
                         # Start task scheduler\r
@@ -1649,15 +2042,12 @@ class Build():
                     # in case there's an interruption. we need a full version of makefile for platform\r
                     Pa.CreateMakeFile(False)\r
                     if BuildTask.HasError():\r
+                        self.invalidateHash()\r
                         EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
+                    self.MakeTime += int(round((time.time() - MakeStart)))\r
+\r
+                MakeContiue = time.time()\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
@@ -1666,12 +2056,13 @@ class Build():
                 ExitFlag.set()\r
                 BuildTask.WaitForComplete()\r
                 self.CreateAsBuiltInf()\r
-\r
+                self.MakeTime += int(round((time.time() - MakeContiue)))\r
                 #\r
                 # Check for build error, and raise exception if one\r
                 # has been signaled.\r
                 #\r
                 if BuildTask.HasError():\r
+                    self.invalidateHash()\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
@@ -1688,14 +2079,14 @@ class Build():
                     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 = []\r
                     if self.LoadFixAddress != 0:\r
                         self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
 \r
@@ -1703,12 +2094,15 @@ class Build():
                         #\r
                         # Generate FD image if there's a FDF file found\r
                         #\r
-                        LaunchCommand(Wa.GenFdsCommand, os.getcwd())\r
+                        GenFdsStart = time.time()\r
+                        if GenFdsApi(Wa.GenFdsCommandDict, self.Db):\r
+                            EdkLogger.error("build", COMMAND_FAILURE)\r
 \r
                         #\r
                         # Create MAP file for all platform FVs after GenFds.\r
                         #\r
                         self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)\r
+                        self.GenFdsTime += int(round((time.time() - GenFdsStart)))\r
                     #\r
                     # Save MAP buffer into MAP file.\r
                     #\r
@@ -1745,7 +2139,7 @@ class Build():
 \r
                     # Look through the tool definitions for GUIDed tools\r
                     guidAttribs = []\r
-                    for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.iteritems():\r
+                    for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.items():\r
                         if attrib.upper().endswith('_GUID'):\r
                             split = attrib.split('_')\r
                             thisPrefix = '_'.join(split[0:3]) + '_'\r
@@ -1762,7 +2156,7 @@ class Build():
                     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
@@ -1797,45 +2191,38 @@ class Build():
             self._BuildModule()\r
 \r
         if self.Target == 'cleanall':\r
-            self.Db.Close()\r
             RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)\r
 \r
     def CreateAsBuiltInf(self):\r
+        all_lib_set = set()\r
+        all_mod_set = set()\r
         for Module in self.BuildModules:\r
             Module.CreateAsBuiltInf()\r
+            all_mod_set.add(Module)\r
+        for Module in self.HashSkipModules:\r
+            Module.CreateAsBuiltInf(True)\r
+            all_mod_set.add(Module)\r
+        for Module in all_mod_set:\r
+            for lib in Module.LibraryAutoGenList:\r
+                all_lib_set.add(lib)\r
+        for lib in all_lib_set:\r
+            lib.CreateAsBuiltInf(True)\r
+        all_lib_set.clear()\r
+        all_mod_set.clear()\r
         self.BuildModules = []\r
+        self.HashSkipModules = []\r
     ## Do some clean-up works when error occurred\r
     def Relinquish(self):\r
         OldLogLevel = EdkLogger.GetLevel()\r
         EdkLogger.SetLevel(EdkLogger.ERROR)\r
-        #self.DumpBuildData()\r
         Utils.Progressor.Abort()\r
         if self.SpawnMode == True:\r
             BuildTask.Abort()\r
         EdkLogger.SetLevel(OldLogLevel)\r
 \r
-    def DumpBuildData(self):\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(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(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
-                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
@@ -1857,6 +2244,18 @@ def SingleCheckCallback(option, opt_str, value, parser):
     else:\r
         parser.error("Option %s only allows one instance in command line!" % option)\r
 \r
+def LogBuildTime(Time):\r
+    if Time:\r
+        TimeDurStr = ''\r
+        TimeDur = time.gmtime(Time)\r
+        if TimeDur.tm_yday > 1:\r
+            TimeDurStr = time.strftime("%H:%M:%S", TimeDur) + ", %d day(s)" % (TimeDur.tm_yday - 1)\r
+        else:\r
+            TimeDurStr = time.strftime("%H:%M:%S", TimeDur)\r
+        return TimeDurStr\r
+    else:\r
+        return None\r
+\r
 ## Parse command line options\r
 #\r
 # Using standard Python module optparse to parse command line option of this tool.\r
@@ -1865,9 +2264,9 @@ def SingleCheckCallback(option, opt_str, value, parser):
 #   @retval Args  Target of build command\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', '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 = 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', 'EBC', 'ARM', 'AARCH64'], dest="TargetArch",\r
+        help="ARCHS is one of list: IA32, X64, 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
@@ -1880,7 +2279,8 @@ def MyOptionParser():
         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
@@ -1908,9 +2308,9 @@ def MyOptionParser():
     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', '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("-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
         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
@@ -1919,8 +2319,14 @@ def MyOptionParser():
     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
+    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
+    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
+    Parser.add_option("--disable-include-path-check", action="store_true", dest="DisableIncludePathCheck", default=False, help="Disable the include path check for outside of package.")\r
+    (Opt, Args) = Parser.parse_args()\r
     return (Opt, Args)\r
 \r
 ## Tool entrance method\r
@@ -1937,7 +2343,7 @@ def Main():
 \r
     # Initialize log system\r
     EdkLogger.Initialize()\r
-\r
+    GlobalData.gCommand = sys.argv[1:]\r
     #\r
     # Parse the options and args\r
     #\r
@@ -1946,16 +2352,16 @@ def Main():
     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
@@ -1970,18 +2376,19 @@ def Main():
     EdkLogger.quiet(time.strftime("Build start time: %H:%M:%S, %b.%d %Y\n", time.localtime()));\r
     ReturnCode = 0\r
     MyBuild = None\r
+    BuildError = True\r
     try:\r
         if len(Target) == 0:\r
             Target = "all"\r
         elif len(Target) >= 2:\r
             EdkLogger.error("build", OPTION_NOT_SUPPORTED, "More than one targets are not supported.",\r
-                            ExtraData="Please select one of: %s" %(' '.join(gSupportedTarget)))\r
+                            ExtraData="Please select one of: %s" % (' '.join(gSupportedTarget)))\r
         else:\r
             Target = Target[0].lower()\r
 \r
         if Target not in gSupportedTarget:\r
             EdkLogger.error("build", OPTION_NOT_SUPPORTED, "Not supported target [%s]." % Target,\r
-                            ExtraData="Please select one of: %s" %(' '.join(gSupportedTarget)))\r
+                            ExtraData="Please select one of: %s" % (' '.join(gSupportedTarget)))\r
 \r
         #\r
         # Check environment variable: EDK_TOOLS_PATH, WORKSPACE, PATH\r
@@ -2014,13 +2421,13 @@ def Main():
             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
@@ -2029,47 +2436,48 @@ def Main():
             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
         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
+        if not (MyBuild.LaunchPrebuildFlag and os.path.exists(MyBuild.PlatformBuildPath)):\r
+            MyBuild.Launch()\r
+\r
+        #\r
+        # All job done, no error found and no exception raised\r
+        #\r
+        BuildError = False\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
+            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
@@ -2077,7 +2485,7 @@ def Main():
                     "\nbuild",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when processing [%s]" % MetaFile,\r
-                    ExtraData="\n(Please send email to edk2-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",\r
+                    ExtraData="\n(Please send email to edk2-devel@lists.01.org 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
@@ -2087,7 +2495,11 @@ def Main():
         Utils.ClearDuplicatedInf()\r
 \r
     if ReturnCode == 0:\r
-        Conclusion = "Done"\r
+        try:\r
+            MyBuild.LaunchPostbuild()\r
+            Conclusion = "Done"\r
+        except:\r
+            Conclusion = "Failed"\r
     elif ReturnCode == ABORT_ERROR:\r
         Conclusion = "Aborted"\r
     else:\r
@@ -2096,12 +2508,13 @@ def Main():
     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
+        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(BuildDurationStr)\r
-        MyBuild.Db.Close()\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
+\r
     EdkLogger.SetLevel(EdkLogger.QUIET)\r
     EdkLogger.quiet("\n- %s -" % Conclusion)\r
     EdkLogger.quiet(time.strftime("Build end time: %H:%M:%S, %b.%d %Y", time.localtime()))\r