Sync BaseTools Branch (version r2271) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / build / build.py

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index b794c0a361ea95de7a01477eb1c7ed0d3bd9dc54..b21f2204b7757ec4a848bf8fde5e60de6bffabef 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -705,7 +705,7 @@ class Build():
     #   @param  SkuId               SKU id from command line\r
     #\r
     def __init__(self, Target, WorkspaceDir, Platform, Module, Arch, ToolChain,\r
-                 BuildTarget, FlashDefinition, FdList=[], FvList=[],\r
+                 BuildTarget, FlashDefinition, FdList=[], FvList=[], CapList=[],\r
                  MakefileType="nmake", SilentMode=False, ThreadNumber=2,\r
                  SkipAutoGen=False, Reparse=False, SkuId=None, \r
                  ReportFile=None, ReportType=None, UniFlag=None):\r
@@ -720,6 +720,7 @@ class Build():
         self.Fdf            = FlashDefinition\r
         self.FdList         = FdList\r
         self.FvList         = FvList\r
+        self.CapList        = CapList\r
         self.MakefileType   = MakefileType\r
         self.SilentMode     = SilentMode\r
         self.ThreadNumber   = ThreadNumber\r
@@ -999,6 +1000,11 @@ class Build():
             try:\r
                 #os.rmdir(AutoGenObject.BuildDir)\r
                 RemoveDirectory(AutoGenObject.BuildDir, True)\r
+                #\r
+                # First should close DB.\r
+                #\r
+                self.Db.Close()     \r
+                RemoveDirectory(gBuildCacheDir, True)\r
             except WindowsError, X:\r
                 EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
         return True\r
@@ -1317,6 +1323,7 @@ class Build():
                         self.Fdf,\r
                         self.FdList,\r
                         self.FvList,\r
+                        self.CapList,\r
                         self.SkuId,\r
                         self.UniFlag\r
                         )\r
@@ -1385,6 +1392,7 @@ class Build():
                         self.Fdf,\r
                         self.FdList,\r
                         self.FvList,\r
+                        self.CapList,\r
                         self.SkuId,\r
                         self.UniFlag\r
                         )\r
@@ -1463,6 +1471,7 @@ class Build():
                         self.Fdf,\r
                         self.FdList,\r
                         self.FvList,\r
+                        self.CapList,\r
                         self.SkuId,\r
                         self.UniFlag\r
                         )\r
@@ -1715,7 +1724,8 @@ 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
@@ -1861,7 +1871,7 @@ def Main():
 \r
         MyBuild = Build(Target, Workspace, Option.PlatformFile, Option.ModuleFile,\r
                         Option.TargetArch, Option.ToolChain, Option.BuildTarget,\r
-                        Option.FdfFile, Option.RomImage, Option.FvImage,\r
+                        Option.FdfFile, Option.RomImage, Option.FvImage, Option.CapName,\r
                         None, Option.SilentMode, Option.ThreadNumber,\r
                         Option.SkipAutoGen, Option.Reparse, Option.SkuId, \r
                         Option.ReportFile, Option.ReportType, Option.Flag)\r
@@ -1919,14 +1929,19 @@ 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
+        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