]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/build/build.py
BaseTools: update the mail address for stack trace info
[mirror_edk2.git] / BaseTools / Source / Python / build / build.py
index 84f5636414f0867aaf2eca0bca3cab74bb67f787..23ca76e82c121777c7455bb35c0ba7e4abc160ca 100644 (file)
@@ -1,7 +1,8 @@
 ## @file\r
 # build a platform or a module\r
 #\r
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
+#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -15,7 +16,7 @@
 ##\r
 # Import Modules\r
 #\r
-import os\r
+import Common.LongFilePathOs as os\r
 import re\r
 import StringIO\r
 import sys\r
@@ -23,7 +24,7 @@ import glob
 import time\r
 import platform\r
 import traceback\r
-import encodings.ascii \r
+import encodings.ascii\r
 \r
 from struct import *\r
 from threading import *\r
@@ -31,12 +32,16 @@ from optparse import OptionParser
 from subprocess import *\r
 from Common import Misc as Utils\r
 \r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.LongFilePathSupport import LongFilePath\r
 from Common.TargetTxtClassObject import *\r
 from Common.ToolDefClassObject import *\r
 from Common.DataType import *\r
+from Common.BuildVersion import gBUILD_VERSION\r
 from AutoGen.AutoGen import *\r
 from Common.BuildToolError import *\r
 from Workspace.WorkspaceDatabase import *\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 from BuildReport import BuildReport\r
 from GenPatchPcdTable.GenPatchPcdTable import *\r
@@ -46,17 +51,19 @@ import Common.EdkLogger
 import Common.GlobalData as GlobalData\r
 \r
 # Version and Copyright\r
-VersionNumber = "0.5"\r
+VersionNumber = "0.60" + ' ' + gBUILD_VERSION\r
 __version__ = "%prog Version " + VersionNumber\r
-__copyright__ = "Copyright (c) 2007 - 2010, Intel Corporation  All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2014, Intel Corporation  All rights reserved."\r
 \r
 ## standard targets of build command\r
 gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']\r
 \r
 ## build configuration file\r
-gBuildConfiguration = "Conf/target.txt"\r
-gBuildCacheDir = "Conf/.cache"\r
-gToolsDefinition = "Conf/tools_def.txt"\r
+gBuildConfiguration = "target.txt"\r
+gToolsDefinition = "tools_def.txt"\r
+\r
+TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')\r
+TmpTableDict = {}\r
 \r
 ## Check environment PATH variable to make sure the specified tool is found\r
 #\r
@@ -98,11 +105,16 @@ def CheckEnvVariable():
         EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in WORKSPACE path",\r
                         ExtraData=WorkspaceDir)\r
     os.environ["WORKSPACE"] = WorkspaceDir\r
+    \r
+    # set multiple workspace\r
+    PackagesPath = os.getenv("PACKAGES_PATH")\r
+    mws.setWs(WorkspaceDir, PackagesPath)\r
 \r
     #\r
-    # Check EFI_SOURCE (R8 build convention). EDK_SOURCE will always point to ECP\r
+    # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP\r
     #\r
-    os.environ["ECP_SOURCE"] = os.path.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)\r
+    if "ECP_SOURCE" not in os.environ:\r
+        os.environ["ECP_SOURCE"] = mws.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
@@ -114,20 +126,20 @@ def CheckEnvVariable():
     EfiSourceDir = os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"]))\r
     EdkSourceDir = os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"]))\r
     EcpSourceDir = os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"]))\r
\r
+\r
     os.environ["EFI_SOURCE"] = EfiSourceDir\r
     os.environ["EDK_SOURCE"] = EdkSourceDir\r
     os.environ["ECP_SOURCE"] = EcpSourceDir\r
     os.environ["EDK_TOOLS_PATH"] = os.path.normcase(os.environ["EDK_TOOLS_PATH"])\r
-    \r
+\r
     if not os.path.exists(EcpSourceDir):\r
-        EdkLogger.verbose("ECP_SOURCE = %s doesn't exist. R8 modules could not be built." % EcpSourceDir)\r
+        EdkLogger.verbose("ECP_SOURCE = %s doesn't exist. Edk modules could not be built." % EcpSourceDir)\r
     elif ' ' in EcpSourceDir:\r
         EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in ECP_SOURCE path",\r
                         ExtraData=EcpSourceDir)\r
     if not os.path.exists(EdkSourceDir):\r
         if EdkSourceDir == EcpSourceDir:\r
-            EdkLogger.verbose("EDK_SOURCE = %s doesn't exist. R8 modules could not be built." % EdkSourceDir)\r
+            EdkLogger.verbose("EDK_SOURCE = %s doesn't exist. Edk modules could not be built." % EdkSourceDir)\r
         else:\r
             EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE does not exist",\r
                             ExtraData=EdkSourceDir)\r
@@ -136,7 +148,7 @@ def CheckEnvVariable():
                         ExtraData=EdkSourceDir)\r
     if not os.path.exists(EfiSourceDir):\r
         if EfiSourceDir == EcpSourceDir:\r
-            EdkLogger.verbose("EFI_SOURCE = %s doesn't exist. R8 modules could not be built." % EfiSourceDir)\r
+            EdkLogger.verbose("EFI_SOURCE = %s doesn't exist. Edk modules could not be built." % EfiSourceDir)\r
         else:\r
             EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE does not exist",\r
                             ExtraData=EfiSourceDir)\r
@@ -144,16 +156,18 @@ def CheckEnvVariable():
         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
+    # check those variables on single workspace case\r
+    if not PackagesPath:\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
@@ -170,6 +184,12 @@ def CheckEnvVariable():
     GlobalData.gEdkSource = EdkSourceDir\r
     GlobalData.gEcpSource = EcpSourceDir\r
 \r
+    GlobalData.gGlobalDefines["WORKSPACE"]  = WorkspaceDir\r
+    GlobalData.gGlobalDefines["EFI_SOURCE"] = EfiSourceDir\r
+    GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir\r
+    GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir\r
+    GlobalData.gGlobalDefines["EDK_TOOLS_PATH"] = os.environ["EDK_TOOLS_PATH"]\r
+    \r
 ## Get normalized file path\r
 #\r
 # Convert the path to be local format, and remove the WORKSPACE path at the\r
@@ -185,11 +205,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
@@ -232,6 +253,14 @@ def LaunchCommand(Command, WorkingDir):
     # if working directory doesn't exist, Popen() will raise an exception\r
     if not os.path.isdir(WorkingDir):\r
         EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=WorkingDir)\r
+    \r
+    # Command is used as the first Argument in following Popen().\r
+    # It could be a string or sequence. We find that if command is a string in following Popen(),\r
+    # ubuntu may fail with an error message that the command is not found.\r
+    # So here we may need convert command from string to list instance.\r
+    if not isinstance(Command, list):\r
+        if platform.system() != 'Windows':\r
+            Command = Command.split()\r
 \r
     Proc = None\r
     EndOfProcedure = None\r
@@ -258,6 +287,7 @@ def LaunchCommand(Command, WorkingDir):
         Proc.wait()\r
     except: # in case of aborting\r
         # terminate the threads redirecting the program output\r
+        EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
         if EndOfProcedure != None:\r
             EndOfProcedure.set()\r
         if Proc == None:\r
@@ -299,10 +329,14 @@ class BuildUnit:
         self.WorkingDir = WorkingDir\r
         self.Target = Target\r
         self.BuildCommand = BuildCommand\r
-        if BuildCommand == None or len(BuildCommand) == 0:\r
-            EdkLogger.error("build", OPTION_MISSING, "No build command found for",\r
+        if not BuildCommand:\r
+            EdkLogger.error("build", OPTION_MISSING,\r
+                            "No build command found for this module. "\r
+                            "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." %\r
+                                (Obj.BuildTarget, Obj.ToolChain, Obj.Arch),\r
                             ExtraData=str(Obj))\r
 \r
+\r
     ## str() method\r
     #\r
     #   It just returns the string representation of self.BuildObject\r
@@ -605,7 +639,8 @@ class BuildTask:
     #\r
     def AddDependency(self, Dependency):\r
         for Dep in Dependency:\r
-            self.DependencyList.append(BuildTask.New(Dep))    # BuildTask list\r
+            if not Dep.BuildObject.IsBinaryModule:\r
+                self.DependencyList.append(BuildTask.New(Dep))    # BuildTask list\r
 \r
     ## The thread wrapper of LaunchCommand function\r
     #\r
@@ -654,7 +689,7 @@ class PeImageInfo():
     #\r
     # Constructor will load all required image information.\r
     #\r
-    #   @param  BaseName          The full file path of image. \r
+    #   @param  BaseName          The full file path of image.\r
     #   @param  Guid              The GUID for image.\r
     #   @param  Arch              Arch of this image.\r
     #   @param  OutputDir         The output directory for image.\r
@@ -688,93 +723,78 @@ class Build():
     #\r
     #   @param  Target              The build command target, one of gSupportedTarget\r
     #   @param  WorkspaceDir        The directory of workspace\r
-    #   @param  Platform            The DSC file of active platform\r
-    #   @param  Module              The INF file of active module, if any\r
-    #   @param  Arch                The Arch list of platform or module\r
-    #   @param  ToolChain           The name list of toolchain\r
-    #   @param  BuildTarget         The "DEBUG" or "RELEASE" build\r
-    #   @param  FlashDefinition     The FDF file of active platform\r
-    #   @param  FdList=[]           The FD names to be individually built\r
-    #   @param  FvList=[]           The FV names to be individually built\r
-    #   @param  MakefileType        The type of makefile (for MSFT make or GNU make)\r
-    #   @param  SilentMode          Indicate multi-thread build mode\r
-    #   @param  ThreadNumber        The maximum number of thread if in multi-thread build mode\r
-    #   @param  SkipAutoGen         Skip AutoGen step\r
-    #   @param  Reparse             Re-parse all meta files\r
-    #   @param  SkuId               SKU id from command line\r
-    #\r
-    def __init__(self, Target, WorkspaceDir, Platform, Module, Arch, ToolChain,\r
-                 BuildTarget, FlashDefinition, FdList=[], FvList=[],\r
-                 MakefileType="nmake", SilentMode=False, ThreadNumber=2,\r
-                 SkipAutoGen=False, Reparse=False, SkuId=None, \r
-                 ReportFile=None, ReportType=None, UniFlag=None):\r
-\r
-        self.WorkspaceDir = WorkspaceDir\r
+    #   @param  BuildOptions        Build options passed from command line\r
+    #\r
+    def __init__(self, Target, WorkspaceDir, BuildOptions):\r
+        self.WorkspaceDir   = WorkspaceDir\r
         self.Target         = Target\r
-        self.PlatformFile   = Platform\r
-        self.ModuleFile     = Module\r
-        self.ArchList       = Arch\r
-        self.ToolChainList  = ToolChain\r
-        self.BuildTargetList= BuildTarget\r
-        self.Fdf            = FlashDefinition\r
-        self.FdList         = FdList\r
-        self.FvList         = FvList\r
-        self.MakefileType   = MakefileType\r
-        self.SilentMode     = SilentMode\r
-        self.ThreadNumber   = ThreadNumber\r
-        self.SkipAutoGen    = SkipAutoGen\r
-        self.Reparse        = Reparse\r
-        self.SkuId          = SkuId\r
+        self.PlatformFile   = BuildOptions.PlatformFile\r
+        self.ModuleFile     = BuildOptions.ModuleFile\r
+        self.ArchList       = BuildOptions.TargetArch\r
+        self.ToolChainList  = BuildOptions.ToolChain\r
+        self.BuildTargetList= BuildOptions.BuildTarget\r
+        self.Fdf            = BuildOptions.FdfFile\r
+        self.FdList         = BuildOptions.RomImage\r
+        self.FvList         = BuildOptions.FvImage\r
+        self.CapList        = BuildOptions.CapName\r
+        self.SilentMode     = BuildOptions.SilentMode\r
+        self.ThreadNumber   = BuildOptions.ThreadNumber\r
+        self.SkipAutoGen    = BuildOptions.SkipAutoGen\r
+        self.Reparse        = BuildOptions.Reparse\r
+        self.SkuId          = BuildOptions.SkuId\r
+        self.ConfDirectory = BuildOptions.ConfDirectory\r
         self.SpawnMode      = True\r
-        self.BuildReport    = BuildReport(ReportFile, ReportType)\r
+        self.BuildReport    = BuildReport(BuildOptions.ReportFile, BuildOptions.ReportType)\r
         self.TargetTxt      = TargetTxtClassObject()\r
         self.ToolDef        = ToolDefClassObject()\r
-        self.Db             = WorkspaceDatabase(None, GlobalData.gGlobalDefines, self.Reparse)\r
-        #self.Db             = WorkspaceDatabase(None, {}, self.Reparse)\r
-        self.BuildDatabase  = self.Db.BuildObject\r
-        self.Platform       = None\r
+        #Set global flag for build mode\r
+        GlobalData.gIgnoreSource = BuildOptions.IgnoreSources\r
+\r
+        if self.ConfDirectory:\r
+            # Get alternate Conf location, if it is absolute, then just use the absolute directory name\r
+            ConfDirectoryPath = os.path.normpath(self.ConfDirectory)\r
+\r
+            if not os.path.isabs(ConfDirectoryPath):\r
+                # Since alternate directory name is not absolute, the alternate directory is located within the WORKSPACE\r
+                # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf\r
+                ConfDirectoryPath = mws.join(self.WorkspaceDir, ConfDirectoryPath)\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.BuildDatabase = self.Db.BuildObject\r
+        self.Platform = None\r
         self.LoadFixAddress = 0\r
-        self.UniFlag        = UniFlag\r
+        self.UniFlag        = BuildOptions.Flag\r
+        self.BuildModules = []\r
 \r
         # print dot character during doing some time-consuming work\r
         self.Progress = Utils.Progressor()\r
 \r
-        # parse target.txt, tools_def.txt, and platform file\r
-        #self.RestoreBuildData()\r
-        self.LoadConfiguration()\r
-        \r
-        #\r
-        # @attention Treat $(TARGET) in meta data files as special macro when it has only one build target.\r
-        # This is not a complete support for $(TARGET) macro as it can only support one build target in ONE\r
-        # invocation of build command. However, it should cover the frequent usage model that $(TARGET) macro\r
-        # is used in DSC files to specify different libraries & PCD setting for debug/release build.\r
-        #\r
-        if len(self.BuildTargetList) == 1:\r
-            self.Db._GlobalMacros.setdefault("TARGET", self.BuildTargetList[0])\r
-        \r
         self.InitBuild()\r
 \r
         # print current build environment and configuration\r
-        EdkLogger.quiet("%-24s = %s" % ("WORKSPACE", os.environ["WORKSPACE"]))\r
-        EdkLogger.quiet("%-24s = %s" % ("ECP_SOURCE", os.environ["ECP_SOURCE"]))\r
-        EdkLogger.quiet("%-24s = %s" % ("EDK_SOURCE", os.environ["EDK_SOURCE"]))\r
-        EdkLogger.quiet("%-24s = %s" % ("EFI_SOURCE", os.environ["EFI_SOURCE"]))\r
-        EdkLogger.quiet("%-24s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))\r
-\r
-        EdkLogger.info('\n%-24s = %s' % ("TARGET_ARCH", ' '.join(self.ArchList)))\r
-        EdkLogger.info('%-24s = %s' % ("TARGET", ' '.join(self.BuildTargetList)))\r
-        EdkLogger.info('%-24s = %s' % ("TOOL_CHAIN_TAG", ' '.join(self.ToolChainList)))\r
-\r
-        EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.PlatformFile))\r
-\r
-        if self.Fdf != None and self.Fdf != "":\r
-            EdkLogger.info('%-24s = %s' % ("Flash Image Definition", self.Fdf))\r
-\r
-        if self.ModuleFile != None and self.ModuleFile != "":\r
-            EdkLogger.info('%-24s = %s' % ("Active Module", self.ModuleFile))\r
+        EdkLogger.quiet("%-16s = %s" % ("WORKSPACE", os.environ["WORKSPACE"]))\r
+        if "PACKAGES_PATH" in os.environ:\r
+            # WORKSPACE env has been converted before. Print the same path style with WORKSPACE env. \r
+            EdkLogger.quiet("%-16s = %s" % ("PACKAGES_PATH", os.path.normcase(os.path.normpath(os.environ["PACKAGES_PATH"]))))\r
+        EdkLogger.quiet("%-16s = %s" % ("ECP_SOURCE", os.environ["ECP_SOURCE"]))\r
+        EdkLogger.quiet("%-16s = %s" % ("EDK_SOURCE", os.environ["EDK_SOURCE"]))\r
+        EdkLogger.quiet("%-16s = %s" % ("EFI_SOURCE", os.environ["EFI_SOURCE"]))\r
+        EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))\r
+        if "EDK_TOOLS_BIN" in os.environ:\r
+            # Print the same path style with WORKSPACE env. \r
+            EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_BIN", os.path.normcase(os.path.normpath(os.environ["EDK_TOOLS_BIN"]))))\r
+\r
+        EdkLogger.info("")\r
 \r
         os.chdir(self.WorkspaceDir)\r
-        self.Progress.Start("\nProcessing meta-data")\r
 \r
     ## Load configuration\r
     #\r
@@ -784,14 +804,14 @@ class Build():
         #\r
         # Check target.txt and tools_def.txt and Init them\r
         #\r
-        BuildConfigurationFile = os.path.normpath(os.path.join(self.WorkspaceDir, gBuildConfiguration))\r
+        BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, gBuildConfiguration))\r
         if os.path.isfile(BuildConfigurationFile) == True:\r
             StatusCode = self.TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
 \r
             ToolDefinitionFile = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
             if ToolDefinitionFile == '':\r
                 ToolDefinitionFile = gToolsDefinition\r
-            ToolDefinitionFile = os.path.normpath(os.path.join(self.WorkspaceDir, ToolDefinitionFile))\r
+                ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
             if os.path.isfile(ToolDefinitionFile) == True:\r
                 StatusCode = self.ToolDef.LoadToolDefFile(ToolDefinitionFile)\r
             else:\r
@@ -800,15 +820,16 @@ class Build():
             EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=BuildConfigurationFile)\r
 \r
         # if no ARCH given in command line, get it from target.txt\r
-        if self.ArchList == None or len(self.ArchList) == 0:\r
+        if not self.ArchList:\r
             self.ArchList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET_ARCH]\r
+        self.ArchList = tuple(self.ArchList)\r
 \r
         # if no build target given in command line, get it from target.txt\r
-        if self.BuildTargetList == None or len(self.BuildTargetList) == 0:\r
+        if not self.BuildTargetList:\r
             self.BuildTargetList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]\r
 \r
         # if no tool chain given in command line, get it from target.txt\r
-        if self.ToolChainList == None or len(self.ToolChainList) == 0:\r
+        if not self.ToolChainList:\r
             self.ToolChainList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_TAG]\r
             if self.ToolChainList == None or len(self.ToolChainList) == 0:\r
                 EdkLogger.error("build", RESOURCE_NOT_AVAILABLE, ExtraData="No toolchain given. Don't know how to build.\n")\r
@@ -854,9 +875,6 @@ class Build():
                                     ExtraData="No active platform specified in target.txt or command line! Nothing can be built.\n")\r
 \r
             self.PlatformFile = PathClass(NormFile(PlatformFile, self.WorkspaceDir), self.WorkspaceDir)\r
-            ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False)\r
-            if ErrorCode != 0:\r
-                EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
 \r
     ## Initialize build configuration\r
     #\r
@@ -864,82 +882,135 @@ class Build():
     #   command line and target.txt, then get the final build configurations.\r
     #\r
     def InitBuild(self):\r
-        ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc")\r
+        # parse target.txt, tools_def.txt, and platform file\r
+        self.LoadConfiguration()\r
+\r
+        # Allow case-insensitive for those from command line or configuration file\r
+        ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False)\r
         if ErrorCode != 0:\r
             EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         # create metafile database\r
         self.Db.InitDatabase()\r
 \r
-        # we need information in platform description file to determine how to build\r
-        self.Platform = self.BuildDatabase[self.PlatformFile, 'COMMON']\r
-        if not self.Fdf:\r
-            self.Fdf = self.Platform.FlashDefinition\r
-        \r
-        LoadFixAddressString = None\r
-        if TAB_FIX_LOAD_TOP_MEMORY_ADDRESS in GlobalData.gGlobalDefines:\r
-            LoadFixAddressString = GlobalData.gGlobalDefines[TAB_FIX_LOAD_TOP_MEMORY_ADDRESS]\r
-        else:\r
-            LoadFixAddressString = self.Platform.LoadFixAddress\r
+    ## Build a module or platform\r
+    #\r
+    # Create autogen code and makefile for a module or platform, and the launch\r
+    # "make" command to build it\r
+    #\r
+    #   @param  Target                      The target of build command\r
+    #   @param  Platform                    The platform file\r
+    #   @param  Module                      The module file\r
+    #   @param  BuildTarget                 The name of build target, one of "DEBUG", "RELEASE"\r
+    #   @param  ToolChain                   The name of toolchain to build\r
+    #   @param  Arch                        The arch of the module/platform\r
+    #   @param  CreateDepModuleCodeFile     Flag used to indicate creating code\r
+    #                                       for dependent modules/Libraries\r
+    #   @param  CreateDepModuleMakeFile     Flag used to indicate creating makefile\r
+    #                                       for dependent modules/Libraries\r
+    #\r
+    def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
+        if AutoGenObject == None:\r
+            return False\r
 \r
-        if LoadFixAddressString != None and LoadFixAddressString != '':\r
-            try:\r
-                if LoadFixAddressString.upper().startswith('0X'):\r
-                    self.LoadFixAddress = int (LoadFixAddressString, 16)\r
-                else:\r
-                    self.LoadFixAddress = int (LoadFixAddressString)\r
-            except:
-                EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS %s is not valid dec or hex string" % (LoadFixAddressString))\r
-            if self.LoadFixAddress < 0:\r
-                EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid negative value %s" % (LoadFixAddressString))\r
-            if self.LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self.LoadFixAddress % 0x1000 != 0:\r
-                EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid unaligned 4K value %s" % (LoadFixAddressString))\r
-\r
-        if self.SkuId == None or self.SkuId == '':\r
-            self.SkuId = self.Platform.SkuName\r
-\r
-        # check FD/FV build target\r
-        if self.Fdf == None or self.Fdf == "":\r
-            if self.FdList != []:\r
-                EdkLogger.info("No flash definition file found. FD [%s] will be ignored." % " ".join(self.FdList))\r
-                self.FdList = []\r
-            if self.FvList != []:\r
-                EdkLogger.info("No flash definition file found. FV [%s] will be ignored." % " ".join(self.FvList))\r
-                self.FvList = []\r
-        else:\r
-            FdfParserObj = FdfParser(str(self.Fdf))\r
-            FdfParserObj.ParseFile()\r
-            for fvname in self.FvList:\r
-                if fvname.upper() not in FdfParserObj.Profile.FvDict.keys():\r
-                    EdkLogger.error("build", OPTION_VALUE_INVALID,\r
-                                    "No such an FV in FDF file: %s" % fvname)\r
+        # skip file generation for cleanxxx targets, run and fds target\r
+        if Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:\r
+            # for target which must generate AutoGen code and makefile\r
+            if not self.SkipAutoGen or Target == 'genc':\r
+                self.Progress.Start("Generating code")\r
+                AutoGenObject.CreateCodeFile(CreateDepsCodeFile)\r
+                self.Progress.Stop("done!")\r
+            if Target == "genc":\r
+                return True\r
 \r
-        #\r
-        # Merge Arch\r
-        #\r
-        if self.ArchList == None or len(self.ArchList) == 0:\r
-            ArchList = set(self.Platform.SupArchList)\r
-        else:\r
-            ArchList = set(self.ArchList) & set(self.Platform.SupArchList)\r
-        if len(ArchList) == 0:\r
-            EdkLogger.error("build", PARAMETER_INVALID,\r
-                            ExtraData = "Active platform supports [%s] only, but [%s] is given."\r
-                                        % (" ".join(self.Platform.SupArchList), " ".join(self.ArchList)))\r
-        elif len(ArchList) != len(self.ArchList):\r
-            SkippedArchList = set(self.ArchList).symmetric_difference(set(self.Platform.SupArchList))\r
-            EdkLogger.verbose("\nArch [%s] is ignored because active platform supports [%s] but [%s] is specified !"\r
-                           % (" ".join(SkippedArchList), " ".join(self.Platform.SupArchList), " ".join(self.ArchList)))\r
-        self.ArchList = tuple(ArchList)\r
-\r
-        # Merge build target\r
-        if self.BuildTargetList == None or len(self.BuildTargetList) == 0:\r
-            BuildTargetList = self.Platform.BuildTargets\r
+            if not self.SkipAutoGen or Target == 'genmake':\r
+                self.Progress.Start("Generating makefile")\r
+                AutoGenObject.CreateMakeFile(CreateDepsMakeFile)\r
+                self.Progress.Stop("done!")\r
+            if Target == "genmake":\r
+                return True\r
         else:\r
-            BuildTargetList = list(set(self.BuildTargetList) & set(self.Platform.BuildTargets))\r
-        if BuildTargetList == []:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "Active platform only supports [%s], but [%s] is given"\r
-                                % (" ".join(self.Platform.BuildTargets), " ".join(self.BuildTargetList)))\r
-        self.BuildTargetList = BuildTargetList\r
+            # always recreate top/platform makefile when clean, just in case of inconsistency\r
+            AutoGenObject.CreateCodeFile(False)\r
+            AutoGenObject.CreateMakeFile(False)\r
+\r
+        if EdkLogger.GetLevel() == EdkLogger.QUIET:\r
+            EdkLogger.quiet("Building ... %s" % repr(AutoGenObject))\r
+\r
+        BuildCommand = AutoGenObject.BuildCommand\r
+        if BuildCommand == None or len(BuildCommand) == 0:\r
+            EdkLogger.error("build", OPTION_MISSING,\r
+                            "No build command found for this module. "\r
+                            "Please check your setting of %s_%s_%s_MAKE_PATH in Conf/tools_def.txt file." %\r
+                                (AutoGenObject.BuildTarget, AutoGenObject.ToolChain, AutoGenObject.Arch),\r
+                            ExtraData=str(AutoGenObject))\r
+\r
+        makefile = GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.gMakeType]\r
+\r
+        # run\r
+        if Target == 'run':\r
+            RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir, GlobalData.gGlobalDefines['ARCH']))\r
+            Command = '.\SecMain'\r
+            os.chdir(RunDir)\r
+            LaunchCommand(Command, RunDir)\r
+            return True\r
+\r
+        # build modules\r
+        if BuildModule:\r
+            BuildCommand = BuildCommand + [Target]\r
+            LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+            self.CreateAsBuiltInf()\r
+            return True\r
+\r
+        # build library\r
+        if Target == 'libraries':\r
+            for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+                NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Lib, makefile)), 'pbuild']\r
+                LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+            return True\r
+\r
+        # build module\r
+        if Target == 'modules':\r
+            for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+                NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Lib, makefile)), 'pbuild']\r
+                LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+            for Mod in AutoGenObject.ModuleBuildDirectoryList:\r
+                NewBuildCommand = BuildCommand + ['-f', os.path.normpath(os.path.join(Mod, makefile)), 'pbuild']\r
+                LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+            self.CreateAsBuiltInf()\r
+            return True\r
+\r
+        # cleanlib\r
+        if Target == 'cleanlib':\r
+            for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+                LibMakefile = os.path.normpath(os.path.join(Lib, makefile))\r
+                if os.path.exists(LibMakefile):\r
+                    NewBuildCommand = BuildCommand + ['-f', LibMakefile, 'cleanall']\r
+                    LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+            return True\r
+\r
+        # clean\r
+        if Target == 'clean':\r
+            for Mod in AutoGenObject.ModuleBuildDirectoryList:\r
+                ModMakefile = os.path.normpath(os.path.join(Mod, makefile))\r
+                if os.path.exists(ModMakefile):\r
+                    NewBuildCommand = BuildCommand + ['-f', ModMakefile, 'cleanall']\r
+                    LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+            for Lib in AutoGenObject.LibraryBuildDirectoryList:\r
+                LibMakefile = os.path.normpath(os.path.join(Lib, makefile))\r
+                if os.path.exists(LibMakefile):\r
+                    NewBuildCommand = BuildCommand + ['-f', LibMakefile, 'cleanall']\r
+                    LaunchCommand(NewBuildCommand, AutoGenObject.MakeFileDir)\r
+            return True\r
+\r
+        # cleanall\r
+        if Target == 'cleanall':\r
+            try:\r
+                #os.rmdir(AutoGenObject.BuildDir)\r
+                RemoveDirectory(AutoGenObject.BuildDir, True)\r
+            except WindowsError, X:\r
+                EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
+        return True\r
 \r
     ## Build a module or platform\r
     #\r
@@ -957,7 +1028,7 @@ class Build():
     #   @param  CreateDepModuleMakeFile     Flag used to indicate creating makefile\r
     #                                       for dependent modules/Libraries\r
     #\r
-    def _Build(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True):\r
+    def _Build(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
         if AutoGenObject == None:\r
             return False\r
 \r
@@ -974,6 +1045,7 @@ class Build():
             if not self.SkipAutoGen or Target == 'genmake':\r
                 self.Progress.Start("Generating makefile")\r
                 AutoGenObject.CreateMakeFile(CreateDepsMakeFile)\r
+                #AutoGenObject.CreateAsBuiltInf()\r
                 self.Progress.Stop("done!")\r
             if Target == "genmake":\r
                 return True\r
@@ -987,10 +1059,41 @@ class Build():
 \r
         BuildCommand = AutoGenObject.BuildCommand\r
         if BuildCommand == None or len(BuildCommand) == 0:\r
-            EdkLogger.error("build", OPTION_MISSING, ExtraData="No MAKE command found for [%s, %s, %s]" % Key)\r
-\r
-        BuildCommand = BuildCommand + [Target]\r
-        LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\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
+            LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+            self.CreateAsBuiltInf()\r
+            return True\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
+            Command = '.\SecMain'\r
+            os.chdir(RunDir)\r
+            LaunchCommand(Command, RunDir)\r
+            return True\r
+\r
+        # build library\r
+        if Target == 'libraries':\r
+            pass\r
+\r
+        # not build modules\r
+\r
+\r
+        # cleanall\r
         if Target == 'cleanall':\r
             try:\r
                 #os.rmdir(AutoGenObject.BuildDir)\r
@@ -1007,8 +1110,8 @@ class Build():
         InfFileNameList = ModuleList.keys()\r
         #InfFileNameList.sort()\r
         for InfFile in InfFileNameList:\r
-            sys.stdout.write (".")
-            sys.stdout.flush()
+            sys.stdout.write (".")\r
+            sys.stdout.flush()\r
             ModuleInfo = ModuleList[InfFile]\r
             ModuleName = ModuleInfo.BaseName\r
             ModuleOutputImage = ModuleInfo.Image.FileName\r
@@ -1020,13 +1123,13 @@ 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
             #\r
@@ -1034,7 +1137,7 @@ class Build():
             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
@@ -1047,7 +1150,7 @@ 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
@@ -1077,9 +1180,9 @@ 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.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress)))\r
             else:\r
-                MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress)) \r
+                MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress))\r
             #\r
             # Add debug image full path.\r
             #\r
@@ -1103,7 +1206,7 @@ class Build():
     ## Collect MAP information of all FVs\r
     #\r
     def _CollectFvMapBuffer (self, MapBuffer, Wa, ModuleList):\r
-        if self.Fdf != '':\r
+        if self.Fdf:\r
             # First get the XIP base address for FV map file.\r
             GuidPattern = re.compile("[-a-fA-F0-9]+")\r
             GuidName = re.compile("\(GUID=[-a-fA-F0-9]+")\r
@@ -1111,7 +1214,7 @@ class Build():
                 FvMapBuffer = os.path.join(Wa.FvDir, FvName + '.Fv.map')\r
                 if not os.path.exists(FvMapBuffer):\r
                     continue\r
-                FvMap = open (FvMapBuffer, 'r')\r
+                FvMap = open(FvMapBuffer, 'r')\r
                 #skip FV size information\r
                 FvMap.readline()\r
                 FvMap.readline()\r
@@ -1141,8 +1244,8 @@ class Build():
     ## Collect MAP information of all modules\r
     #\r
     def _CollectModuleMapBuffer (self, MapBuffer, ModuleList):\r
-        sys.stdout.write ("Generate Load Module At Fix Address Map")
-        sys.stdout.flush()
+        sys.stdout.write ("Generate Load Module At Fix Address Map")\r
+        sys.stdout.flush()\r
         PatchEfiImageList = []\r
         PeiModuleList  = {}\r
         BtModuleList   = {}\r
@@ -1159,7 +1262,7 @@ class Build():
         for ModuleGuid in ModuleList:\r
             Module = ModuleList[ModuleGuid]\r
             GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (Module.MetaFile, Module.Arch, Module.ToolChain, Module.BuildTarget)\r
-            \r
+\r
             OutputImageFile = ''\r
             for ResultFile in Module.CodaTargetList:\r
                 if str(ResultFile.Target).endswith('.efi'):\r
@@ -1171,7 +1274,7 @@ 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 ['PEI_CORE', 'PEIM', 'COMBINED_PEIM_DRIVER', 'PIC_PEIM', 'RELOCATABLE_PEIM', 'DXE_CORE']:\r
                         PeiModuleList[Module.MetaFile] = ImageInfo\r
                         PeiSize += ImageInfo.Image.Size\r
                     elif Module.ModuleType in ['BS_DRIVER', 'DXE_DRIVER', 'UEFI_DRIVER']:\r
@@ -1187,11 +1290,11 @@ class Build():
                         SmmModuleList[Module.MetaFile] = ImageInfo\r
                         SmmSize += ImageInfo.Image.Size\r
                         if Module.ModuleType == 'DXE_SMM_DRIVER':\r
-                            PiSpecVersion = 0
-                            if 'PI_SPECIFICATION_VERSION' in Module.Module.Specification:
-                                PiSpecVersion = Module.Module.Specification['PI_SPECIFICATION_VERSION']
+                            PiSpecVersion = '0x00000000'\r
+                            if 'PI_SPECIFICATION_VERSION' in Module.Module.Specification:\r
+                                PiSpecVersion = Module.Module.Specification['PI_SPECIFICATION_VERSION']\r
                             # for PI specification < PI1.1, DXE_SMM_DRIVER also runs as BOOT time driver.\r
-                            if PiSpecVersion < 0x0001000A:\r
+                            if int(PiSpecVersion, 16) < 0x0001000A:\r
                                 BtModuleList[Module.MetaFile] = ImageInfo\r
                                 BtSize += ImageInfo.Image.Size\r
                     break\r
@@ -1210,15 +1313,15 @@ class Build():
                         if Pcd.Type == TAB_PCDS_PATCHABLE_IN_MODULE and Pcd.TokenCName in TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_LIST:\r
                             ModuleIsPatch = True\r
                             break\r
-                \r
+\r
                 if not ModuleIsPatch:\r
                     continue\r
                 #\r
                 # Module includes the patchable load fix address PCDs.\r
-                # It will be fixed up later. \r
+                # It will be fixed up later.\r
                 #\r
                 PatchEfiImageList.append (OutputImageFile)\r
-        \r
+\r
         #\r
         # Get Top Memory address\r
         #\r
@@ -1238,48 +1341,48 @@ class Build():
         #\r
         # Patch FixAddress related PCDs into EFI image\r
         #\r
-        for EfiImage in PatchEfiImageList: \r
+        for EfiImage in PatchEfiImageList:\r
             EfiImageMap = EfiImage.replace('.efi', '.map')\r
             if not os.path.exists(EfiImageMap):\r
                 continue\r
             #\r
             # Get PCD offset in EFI image by GenPatchPcdTable function\r
             #\r
-            PcdTable = parsePcdInfoFromMapFile(EfiImageMap, EfiImage) 
+            PcdTable = parsePcdInfoFromMapFile(EfiImageMap, EfiImage)\r
             #\r
             # Patch real PCD value by PatchPcdValue tool\r
             #\r
             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
+\r
+        MapBuffer.write('PEI_CODE_PAGE_NUMBER      = 0x%x\n' % (PeiSize / 0x1000))\r
+        MapBuffer.write('BOOT_CODE_PAGE_NUMBER     = 0x%x\n' % (BtSize / 0x1000))\r
+        MapBuffer.write('RUNTIME_CODE_PAGE_NUMBER  = 0x%x\n' % (RtSize / 0x1000))\r
         if len (SmmModuleList) > 0:\r
-            MapBuffer.write('SMM_CODE_PAGE_NUMBER      = 0x%x\n' % (SmmSize/0x1000))\r
-        \r
-        PeiBaseAddr = TopMemoryAddress - RtSize - BtSize \r
+            MapBuffer.write('SMM_CODE_PAGE_NUMBER      = 0x%x\n' % (SmmSize / 0x1000))\r
+\r
+        PeiBaseAddr = TopMemoryAddress - RtSize - BtSize\r
         BtBaseAddr  = TopMemoryAddress - RtSize\r
-        RtBaseAddr  = TopMemoryAddress - ReservedRuntimeMemorySize \r
+        RtBaseAddr  = TopMemoryAddress - ReservedRuntimeMemorySize\r
 \r
         self._RebaseModule (MapBuffer, PeiBaseAddr, PeiModuleList, TopMemoryAddress == 0)\r
         self._RebaseModule (MapBuffer, BtBaseAddr, BtModuleList, TopMemoryAddress == 0)\r
         self._RebaseModule (MapBuffer, RtBaseAddr, RtModuleList, TopMemoryAddress == 0)\r
-        self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset = False, ModeIsSmm = True)\r
+        self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset=False, ModeIsSmm=True)\r
         MapBuffer.write('\n\n')\r
-        sys.stdout.write ("\n")
-        sys.stdout.flush()
-    \r
+        sys.stdout.write ("\n")\r
+        sys.stdout.flush()\r
+\r
     ## Save platform Map file\r
     #\r
     def _SaveMapFile (self, MapBuffer, Wa):\r
@@ -1291,19 +1394,22 @@ class Build():
         # Save address map into MAP file.\r
         #\r
         SaveFileOnChange(MapFilePath, MapBuffer.getvalue(), False)\r
-        MapBuffer.close()
-        if self.LoadFixAddress != 0:
-            sys.stdout.write ("\nLoad Module At Fix Address Map file can be found at %s\n" %(MapFilePath))
-        sys.stdout.flush()
+        MapBuffer.close()\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.flush()\r
 \r
     ## Build active platform for different build targets and different tool chains\r
     #\r
     def _BuildPlatform(self):\r
         for BuildTarget in self.BuildTargetList:\r
+            GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
             for ToolChain in self.ToolChainList:\r
+                GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
+                GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
                 Wa = WorkspaceAutoGen(\r
                         self.WorkspaceDir,\r
-                        self.Platform,\r
+                        self.PlatformFile,\r
                         BuildTarget,\r
                         ToolChain,\r
                         self.ArchList,\r
@@ -1313,21 +1419,35 @@ class Build():
                         self.Fdf,\r
                         self.FdList,\r
                         self.FvList,\r
+                        self.CapList,\r
                         self.SkuId,\r
-                        self.UniFlag\r
+                        self.UniFlag,\r
+                        self.Progress\r
                         )\r
+                self.Fdf = Wa.FdfFile\r
+                self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
                 self.BuildReport.AddPlatformReport(Wa)\r
                 self.Progress.Stop("done!")\r
-                self._Build(self.Target, Wa)\r
-                \r
+                for Arch in Wa.ArchList:\r
+                    GlobalData.gGlobalDefines['ARCH'] = Arch\r
+                    Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
+                    for Module in Pa.Platform.Modules:\r
+                        # Get ModuleAutoGen object to generate C code file and makefile\r
+                        Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
+                        if Ma == None:\r
+                            continue\r
+                        self.BuildModules.append(Ma)\r
+                    self._BuildPa(self.Target, Pa)\r
+\r
                 # Create MAP file when Load Fix Address is enabled.\r
                 if self.Target in ["", "all", "fds"]:\r
-                    for Arch in self.ArchList:\r
+                    for Arch in Wa.ArchList:\r
+                        GlobalData.gGlobalDefines['ARCH'] = Arch\r
                         #\r
                         # Check whether the set fix address is above 4G for 32bit image.\r
                         #\r
                         if (Arch == 'IA32' or Arch == 'ARM') and self.LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self.LoadFixAddress >= 0x100000000:\r
-                            EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to larger than or equal to 4G for the platorm with IA32 or ARM arch modules")\r
+                            EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to larger than or equal to 4G for the platform with IA32 or ARM arch modules")\r
                     #\r
                     # Get Module List\r
                     #\r
@@ -1345,12 +1465,11 @@ class Build():
                         # 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
+                    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
@@ -1364,14 +1483,17 @@ class Build():
     #\r
     def _BuildModule(self):\r
         for BuildTarget in self.BuildTargetList:\r
+            GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
             for ToolChain in self.ToolChainList:\r
+                GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
+                GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
                 #\r
                 # module build needs platform build information, so get platform\r
                 # AutoGen first\r
                 #\r
                 Wa = WorkspaceAutoGen(\r
                         self.WorkspaceDir,\r
-                        self.Platform,\r
+                        self.PlatformFile,\r
                         BuildTarget,\r
                         ToolChain,\r
                         self.ArchList,\r
@@ -1381,17 +1503,25 @@ class Build():
                         self.Fdf,\r
                         self.FdList,\r
                         self.FvList,\r
+                        self.CapList,\r
                         self.SkuId,\r
-                        self.UniFlag\r
+                        self.UniFlag,\r
+                        self.Progress,\r
+                        self.ModuleFile\r
                         )\r
+                self.Fdf = Wa.FdfFile\r
+                self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
                 Wa.CreateMakeFile(False)\r
                 self.Progress.Stop("done!")\r
                 MaList = []\r
-                for Arch in self.ArchList:\r
+                for Arch in Wa.ArchList:\r
+                    GlobalData.gGlobalDefines['ARCH'] = Arch\r
                     Ma = ModuleAutoGen(Wa, self.ModuleFile, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
                     if Ma == None: continue\r
                     MaList.append(Ma)\r
-                    self._Build(self.Target, Ma)\r
+                    self.BuildModules.append(Ma)\r
+                    if not Ma.IsBinaryModule:\r
+                        self._Build(self.Target, Ma, BuildModule=True)\r
 \r
                 self.BuildReport.AddPlatformReport(Wa, MaList)\r
                 if MaList == []:\r
@@ -1400,13 +1530,13 @@ 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
-                                    (', '.join(self.ArchList), self.Platform),\r
+                                " given in the same as in [%s]" % \\r
+                                    (', '.join(Wa.ArchList), self.PlatformFile),\r
                                 ExtraData=self.ModuleFile\r
                                 )\r
                 # Create MAP file when Load Fix Address is enabled.\r
-                if self.Target == "fds" and self.Fdf != '':\r
-                    for Arch in self.ArchList:\r
+                if self.Target == "fds" and self.Fdf:\r
+                    for Arch in Wa.ArchList:\r
                         #\r
                         # Check whether the set fix address is above 4G for 32bit image.\r
                         #\r
@@ -1429,10 +1559,10 @@ class Build():
                         # 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
+                    self._Build("fds", Wa)\r
                     #\r
                     # Create MAP file for all platform FVs after GenFds.\r
                     #\r
@@ -1446,10 +1576,13 @@ class Build():
     #\r
     def _MultiThreadBuildPlatform(self):\r
         for BuildTarget in self.BuildTargetList:\r
+            GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
             for ToolChain in self.ToolChainList:\r
+                GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
+                GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
                 Wa = WorkspaceAutoGen(\r
                         self.WorkspaceDir,\r
-                        self.Platform,\r
+                        self.PlatformFile,\r
                         BuildTarget,\r
                         ToolChain,\r
                         self.ArchList,\r
@@ -1459,22 +1592,38 @@ class Build():
                         self.Fdf,\r
                         self.FdList,\r
                         self.FvList,\r
+                        self.CapList,\r
                         self.SkuId,\r
-                        self.UniFlag\r
+                        self.UniFlag,\r
+                        self.Progress\r
                         )\r
+                self.Fdf = Wa.FdfFile\r
+                self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
                 self.BuildReport.AddPlatformReport(Wa)\r
                 Wa.CreateMakeFile(False)\r
 \r
                 # multi-thread exit flag\r
                 ExitFlag = threading.Event()\r
                 ExitFlag.clear()\r
-                for Arch in self.ArchList:\r
+                for Arch in Wa.ArchList:\r
+                    GlobalData.gGlobalDefines['ARCH'] = Arch\r
                     Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
                     if Pa == None:\r
                         continue\r
-                    for Module in Pa.Platform.Modules:\r
+                    ModuleList = []\r
+                    for Inf in Pa.Platform.Modules:\r
+                        ModuleList.append(Inf)\r
+                    # Add the INF only list in FDF\r
+                    if GlobalData.gFdfParser != None:\r
+                        for InfName in GlobalData.gFdfParser.Profile.InfList:\r
+                            Inf = PathClass(NormPath(InfName), self.WorkspaceDir, Arch)\r
+                            if Inf in Pa.Platform.Modules:\r
+                                continue\r
+                            ModuleList.append(Inf)\r
+                    for Module in ModuleList:\r
                         # Get ModuleAutoGen object to generate C code file and makefile\r
                         Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
+                        \r
                         if Ma == None:\r
                             continue\r
                         # Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'\r
@@ -1489,9 +1638,13 @@ class Build():
                                 Ma.CreateMakeFile(True)\r
                             if self.Target == "genmake":\r
                                 continue\r
-                        self.Progress.Stop("done!")\r
+                        self.BuildModules.append(Ma)\r
+                    self.Progress.Stop("done!")\r
+\r
+                    for Ma in self.BuildModules:\r
                         # Generate build task for the module\r
-                        Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target))\r
+                        if not Ma.IsBinaryModule:\r
+                            Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target))\r
                         # Break build if any build thread has error\r
                         if BuildTask.HasError():\r
                             # we need a full version of makefile for platform\r
@@ -1508,12 +1661,21 @@ class Build():
                     if BuildTask.HasError():\r
                         EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
 \r
+                #\r
+                # Save temp tables to a TmpTableDict.\r
+                #\r
+                for Key in Wa.BuildDatabase._CACHE_:\r
+                    if Wa.BuildDatabase._CACHE_[Key]._RawData and Wa.BuildDatabase._CACHE_[Key]._RawData._Table and Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table:\r
+                        if TemporaryTablePattern.match(Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table):\r
+                            TmpTableDict[Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table] = Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Cur\r
+                #\r
                 #\r
                 # All modules have been put in build tasks queue. Tell task scheduler\r
                 # to exit if all tasks are completed\r
                 #\r
                 ExitFlag.set()\r
                 BuildTask.WaitForComplete()\r
+                self.CreateAsBuiltInf()\r
 \r
                 #\r
                 # Check for build error, and raise exception if one\r
@@ -1524,7 +1686,7 @@ class Build():
 \r
                 # Create MAP file when Load Fix Address is enabled.\r
                 if self.Target in ["", "all", "fds"]:\r
-                    for Arch in self.ArchList:\r
+                    for Arch in Wa.ArchList:\r
                         #\r
                         # Check whether the set fix address is above 4G for 32bit image.\r
                         #\r
@@ -1547,11 +1709,12 @@ class Build():
                     if self.LoadFixAddress != 0:\r
                         self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
 \r
-                    if self.Fdf != '':\r
+                    if self.Fdf:\r
                         #\r
                         # Generate FD image if there's a FDF file found\r
                         #\r
-                        LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
+                        LaunchCommand(Wa.GenFdsCommand, os.getcwd())\r
+\r
                         #\r
                         # Create MAP file for all platform FVs after GenFds.\r
                         #\r
@@ -1564,17 +1727,29 @@ class Build():
     ## Generate GuidedSectionTools.txt in the FV directories.\r
     #\r
     def CreateGuidedSectionToolsFile(self):\r
-        for Arch in self.ArchList:\r
-            for BuildTarget in self.BuildTargetList:\r
-                for ToolChain in self.ToolChainList:\r
-                    FvDir = os.path.join(\r
-                                self.WorkspaceDir,\r
-                                self.Platform.OutputDirectory,\r
-                                '_'.join((BuildTarget, ToolChain)),\r
-                                'FV'\r
-                                )\r
-                    if not os.path.exists(FvDir):\r
-                        continue\r
+        for BuildTarget in self.BuildTargetList:\r
+            for ToolChain in self.ToolChainList:\r
+                Wa = WorkspaceAutoGen(\r
+                        self.WorkspaceDir,\r
+                        self.PlatformFile,\r
+                        BuildTarget,\r
+                        ToolChain,\r
+                        self.ArchList,\r
+                        self.BuildDatabase,\r
+                        self.TargetTxt,\r
+                        self.ToolDef,\r
+                        self.Fdf,\r
+                        self.FdList,\r
+                        self.FvList,\r
+                        self.CapList,\r
+                        self.SkuId,\r
+                        self.UniFlag\r
+                        )\r
+                FvDir = Wa.FvDir\r
+                if not os.path.exists(FvDir):\r
+                    continue\r
+\r
+                for Arch in self.ArchList:\r
                     # Build up the list of supported architectures for this build\r
                     prefix = '%s_%s_%s_' % (BuildTarget, ToolChain, Arch)\r
 \r
@@ -1620,7 +1795,7 @@ class Build():
     ## Launch the module or platform build\r
     #\r
     def Launch(self):\r
-        if self.ModuleFile == None or self.ModuleFile == "":\r
+        if not self.ModuleFile:\r
             if not self.SpawnMode or self.Target not in ["", "all"]:\r
                 self.SpawnMode = False\r
                 self._BuildPlatform()\r
@@ -1631,6 +1806,14 @@ class Build():
             self.SpawnMode = False\r
             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
+        for Module in self.BuildModules:\r
+            Module.CreateAsBuiltInf()\r
+        self.BuildModules = []\r
     ## Do some clean-up works when error occurred\r
     def Relinquish(self):\r
         OldLogLevel = EdkLogger.GetLevel()\r
@@ -1642,19 +1825,19 @@ class Build():
         EdkLogger.SetLevel(OldLogLevel)\r
 \r
     def DumpBuildData(self):\r
-        CacheDirectory = os.path.join(self.WorkspaceDir, gBuildCacheDir)\r
+        CacheDirectory = os.path.dirname(GlobalData.gDatabasePath)\r
         Utils.CreateDirectory(CacheDirectory)\r
         Utils.DataDump(Utils.gFileTimeStampCache, os.path.join(CacheDirectory, "gFileTimeStampCache"))\r
         Utils.DataDump(Utils.gDependencyDatabase, os.path.join(CacheDirectory, "gDependencyDatabase"))\r
 \r
     def RestoreBuildData(self):\r
-        FilePath = os.path.join(self.WorkspaceDir, gBuildCacheDir, "gFileTimeStampCache")\r
+        FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gFileTimeStampCache")\r
         if Utils.gFileTimeStampCache == {} and os.path.isfile(FilePath):\r
             Utils.gFileTimeStampCache = Utils.DataRestore(FilePath)\r
             if Utils.gFileTimeStampCache == None:\r
                 Utils.gFileTimeStampCache = {}\r
 \r
-        FilePath = os.path.join(self.WorkspaceDir, gBuildCacheDir, "gDependencyDatabase")\r
+        FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gDependencyDatabase")\r
         if Utils.gDependencyDatabase == {} and os.path.isfile(FilePath):\r
             Utils.gDependencyDatabase = Utils.DataRestore(FilePath)\r
             if Utils.gDependencyDatabase == None:\r
@@ -1665,8 +1848,13 @@ def ParseDefines(DefineList=[]):
     if DefineList != None:\r
         for Define in DefineList:\r
             DefineTokenList = Define.split("=", 1)\r
+            if not GlobalData.gMacroNamePattern.match(DefineTokenList[0]):\r
+                EdkLogger.error('build', FORMAT_INVALID,\r
+                                "The macro name must be in the pattern [A-Z][A-Z0-9_]*",\r
+                                ExtraData=DefineTokenList[0])\r
+\r
             if len(DefineTokenList) == 1:\r
-                DefineDict[DefineTokenList[0]] = ""\r
+                DefineDict[DefineTokenList[0]] = "TRUE"\r
             else:\r
                 DefineDict[DefineTokenList[0]] = DefineTokenList[1].strip()\r
     return DefineDict\r
@@ -1687,15 +1875,15 @@ 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'], dest="TargetArch",\r
-        help="ARCHS is one of list: IA32, X64, IPF, ARM or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.")\r
+    Parser = 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.add_option("-p", "--platform", action="callback", type="string", dest="PlatformFile", callback=SingleCheckCallback,\r
         help="Build the platform specified by the DSC file name argument, overriding target.txt's ACTIVE_PLATFORM definition.")\r
     Parser.add_option("-m", "--module", action="callback", type="string", dest="ModuleFile", callback=SingleCheckCallback,\r
         help="Build the module specified by the INF file name argument.")\r
-    Parser.add_option("-b", "--buildtarget", action="append", type="choice", choices=['DEBUG','RELEASE'], dest="BuildTarget",\r
-        help="BuildTarget is one of list: DEBUG, RELEASE, which overrides target.txt's TARGET definition. To specify more TARGET, please repeat this option.")\r
+    Parser.add_option("-b", "--buildtarget", type="string", dest="BuildTarget", help="Using the TARGET to build the platform, overriding target.txt's TARGET definition.",\r
+                      action="append")\r
     Parser.add_option("-t", "--tagname", action="append", type="string", dest="ToolChain",\r
         help="Using the Tool Chain Tagname to build the platform, overriding target.txt's TOOL_CHAIN_TAG definition.")\r
     Parser.add_option("-x", "--sku-id", action="callback", type="string", dest="SkuId", callback=SingleCheckCallback,\r
@@ -1710,14 +1898,12 @@ def MyOptionParser():
         help="The name of FD to be generated. The name must be from [FD] section in FDF file.")\r
     Parser.add_option("-i", "--fv-image", action="append", type="string", dest="FvImage", default=[],\r
         help="The name of FV to be generated. The name must be from [FV] section in FDF file.")\r
-\r
+    Parser.add_option("-C", "--capsule-image", action="append", type="string", dest="CapName", default=[],\r
+        help="The name of Capsule to be generated. The name must be from [Capsule] section in FDF file.")\r
     Parser.add_option("-u", "--skip-autogen", action="store_true", dest="SkipAutoGen", help="Skip AutoGen step.")\r
     Parser.add_option("-e", "--re-parse", action="store_true", dest="Reparse", help="Re-parse all meta-data files.")\r
 \r
-    Parser.add_option("-c", "--case-insensitive", action="store_true", dest="CaseInsensitive", help="Don't check case of file name.")\r
-\r
-    # Parser.add_option("-D", "--define", action="append", dest="Defines", metavar="NAME[=[VALUE]]",\r
-    #     help="Define global macro which can be used in DSC/DEC/INF files.")\r
+    Parser.add_option("-c", "--case-insensitive", action="store_true", dest="CaseInsensitive", default=False, help="Don't check case of file name.")\r
 \r
     Parser.add_option("-w", "--warning-as-error", action="store_true", dest="WarningAsError", help="Treat warning in tools as error.")\r
     Parser.add_option("-j", "--log", action="store", dest="LogFile", help="Put log in specified file as well as on console.")\r
@@ -1732,15 +1918,19 @@ 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
+    Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD', 'LIBRARY', 'FLASH', 'DEPEX', 'BUILD_FLAGS', 'FIXED_ADDRESS', 'EXECUTION_ORDER'], dest="ReportType", default=[],\r
         help="Flags that control the type of build report to generate.  Must be one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, EXECUTION_ORDER].  "\\r
              "To specify more than one flag, repeat this option on the command line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS]")\r
     Parser.add_option("-F", "--flag", action="store", type="string", dest="Flag",\r
         help="Specify the specific option to parse EDK UNI file. Must be one of: [-c, -s]. -c is for EDK framework UNI file, and -s is for EDK UEFI UNI file. "\\r
              "This option can also be specified by setting *_*_*_BUILD_FLAGS in [BuildOptions] section of platform DSC. If they are both specified, this value "\\r
              "will override the setting in [BuildOptions] section of platform DSC.")\r
+    Parser.add_option("-N", "--no-cache", action="store_true", dest="DisableCache", default=False, help="Disable build cache mechanism")\r
+    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
+    (Opt, Args) = Parser.parse_args()\r
     return (Opt, Args)\r
 \r
 ## Tool entrance method\r
@@ -1790,24 +1980,26 @@ 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
-        GlobalData.gGlobalDefines = ParseDefines(Option.Macros)\r
         #\r
         # Check environment variable: EDK_TOOLS_PATH, WORKSPACE, PATH\r
         #\r
         CheckEnvVariable()\r
+        GlobalData.gCommandLineDefines.update(ParseDefines(Option.Macros))\r
+\r
         Workspace = os.getenv("WORKSPACE")\r
         #\r
         # Get files real name in workspace dir\r
@@ -1838,9 +2030,6 @@ def Main():
                 if os.path.normcase (os.path.normpath(Option.PlatformFile)).find (Workspace) == 0:\r
                     Option.PlatformFile = NormFile(os.path.normpath(Option.PlatformFile), Workspace)\r
             Option.PlatformFile = PathClass(Option.PlatformFile, Workspace)\r
-            ErrorCode, ErrorInfo = Option.PlatformFile.Validate(".dsc", False)\r
-            if ErrorCode != 0:\r
-                EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if Option.FdfFile != None:\r
             if os.path.isabs (Option.FdfFile):\r
@@ -1854,14 +2043,18 @@ def Main():
         if Option.Flag != None and Option.Flag not in ['-c', '-s']:\r
             EdkLogger.error("build", OPTION_VALUE_INVALID, "UNI flag must be one of -c or -s")\r
 \r
-        MyBuild = Build(Target, Workspace, Option.PlatformFile, Option.ModuleFile,\r
-                        Option.TargetArch, Option.ToolChain, Option.BuildTarget,\r
-                        Option.FdfFile, Option.RomImage, Option.FvImage,\r
-                        None, Option.SilentMode, Option.ThreadNumber,\r
-                        Option.SkipAutoGen, Option.Reparse, Option.SkuId, \r
-                        Option.ReportFile, Option.ReportType, Option.Flag)\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
+        #\r
+        # All job done, no error found and no exception raised\r
+        #\r
+        BuildError = False\r
     except FatalError, X:\r
         if MyBuild != None:\r
             # for multi-thread build exits safely\r
@@ -1877,7 +2070,7 @@ def Main():
         if Option != None and Option.debug != 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
@@ -1899,13 +2092,14 @@ def Main():
                     "\nbuild",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when processing [%s]" % MetaFile,\r
-                    ExtraData="\n(Please send email to edk2-buildtools-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",\r
+                    ExtraData="\n(Please send email to edk2-devel@lists.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
         ReturnCode = CODE_ERROR\r
     finally:\r
         Utils.Progressor.Abort()\r
+        Utils.ClearDuplicatedInf()\r
 \r
     if ReturnCode == 0:\r
         Conclusion = "Done"\r
@@ -1914,14 +2108,20 @@ def Main():
     else:\r
         Conclusion = "Failed"\r
     FinishTime = time.time()\r
-    BuildDuration = time.strftime("%M:%S", time.gmtime(int(round(FinishTime - StartTime))))\r
+    BuildDuration = time.gmtime(int(round(FinishTime - StartTime)))\r
+    BuildDurationStr = ""\r
+    if BuildDuration.tm_yday > 1:\r
+        BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration) + ", %d day(s)" % (BuildDuration.tm_yday - 1)\r
+    else:\r
+        BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration)\r
     if MyBuild != None:\r
-        MyBuild.BuildReport.GenerateReport(BuildDuration)\r
+        if not BuildError:\r
+            MyBuild.BuildReport.GenerateReport(BuildDurationStr)\r
         MyBuild.Db.Close()\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
-    EdkLogger.quiet("Build total time: %s\n" % BuildDuration)\r
+    EdkLogger.quiet("Build total time: %s\n" % BuildDurationStr)\r
     return ReturnCode\r
 \r
 if __name__ == '__main__':\r