BaseTools: Refactor hash tracking after checking for Sources section

[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 7271570d2956db80e50e6667b1aa2f6d0d6baf07..0855d4561cf8ca6a1b19345f2d380a0c49e8d3c1 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -593,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
@@ -605,6 +605,11 @@ class BuildTask:
         try:\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 running, so that the user can\r
@@ -620,8 +625,16 @@ 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
+\r
+        # Set the value used by hash invalidation flow in GlobalData.gModuleBuildTracking to 'SUCCESS'\r
+        # If Module or Lib is being tracked, it did not fail header check test, and built successfully\r
+        if (self.BuildItem.BuildObject.Arch in GlobalData.gModuleBuildTracking and\r
+           self.BuildItem.BuildObject in GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject.Arch] and\r
+           GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject.Arch][self.BuildItem.BuildObject] != 'FAIL_METAFILE' and\r
+           not BuildTask._ErrorFlag.isSet()\r
+           ):\r
+            GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject.Arch][self.BuildItem.BuildObject] = 'SUCCESS'\r
+\r
         # indicate there's a thread is available for another build task\r
         BuildTask._RunningQueueLock.acquire()\r
         BuildTask._RunningQueue.pop(self.BuildItem)\r
@@ -1149,27 +1162,30 @@ class Build():
     #\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
+        # Only for hashing feature\r
+        if not GlobalData.gUseHashCache:\r
+            return\r
+\r
+        # GlobalData.gModuleBuildTracking contains only modules or libs that cannot be skipped by hash\r
+        for moduleAutoGenObjArch in GlobalData.gModuleBuildTracking.keys():\r
+            for moduleAutoGenObj in GlobalData.gModuleBuildTracking[moduleAutoGenObjArch].keys():\r
+                # Skip invalidating for Successful Module/Lib builds\r
+                if GlobalData.gModuleBuildTracking[moduleAutoGenObjArch][moduleAutoGenObj] == 'SUCCESS':\r
+                    continue\r
 \r
-            # The module failed to build or failed to start building, from this point on\r
+                # The module failed to build, failed to start building, or failed the header check test from this point on\r
 \r
-            # Remove .hash from build\r
-            if GlobalData.gUseHashCache:\r
-                ModuleHashFile = path.join(moduleAutoGenObj.BuildDir, moduleAutoGenObj.Name + ".hash")\r
+                # Remove .hash from build\r
+                ModuleHashFile = os.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
+                # Remove .hash file from cache\r
+                if GlobalData.gBinCacheDest:\r
+                    FileDir = os.path.join(GlobalData.gBinCacheDest, moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseName)\r
+                    HashFile = os.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
@@ -1227,10 +1243,6 @@ class Build():
 \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
@@ -1359,10 +1371,6 @@ class Build():
 \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
@@ -1828,9 +1836,11 @@ class Build():
                                 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
+                            # Initialize all modules in tracking to 'FAIL'\r
+                            if Ma.Arch not in GlobalData.gModuleBuildTracking:\r
+                                GlobalData.gModuleBuildTracking[Ma.Arch] = dict()\r
+                            if Ma not in GlobalData.gModuleBuildTracking[Ma.Arch]:\r
+                                GlobalData.gModuleBuildTracking[Ma.Arch][Ma] = 'FAIL'\r
                     self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
                     MakeStart = time.time()\r
                     for Ma in self.BuildModules:\r
@@ -1914,6 +1924,7 @@ class Build():
                     # Save MAP buffer into MAP file.\r
                     #\r
                     self._SaveMapFile (MapBuffer, Wa)\r
+        self.invalidateHash()\r
 \r
     def _GenFfsCmd(self,ArchList):\r
         # convert dictionary of Cmd:(Inf,Arch)\r
@@ -2012,9 +2023,11 @@ class Build():
                             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
+                        # Initialize all modules in tracking to 'FAIL'\r
+                        if Ma.Arch not in GlobalData.gModuleBuildTracking:\r
+                            GlobalData.gModuleBuildTracking[Ma.Arch] = dict()\r
+                        if Ma not in GlobalData.gModuleBuildTracking[Ma.Arch]:\r
+                            GlobalData.gModuleBuildTracking[Ma.Arch][Ma] = 'FAIL'\r
                     self.Progress.Stop("done!")\r
                     self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
                     MakeStart = time.time()\r
@@ -2102,6 +2115,7 @@ class Build():
                     # Save MAP buffer into MAP file.\r
                     #\r
                     self._SaveMapFile(MapBuffer, Wa)\r
+        self.invalidateHash()\r
 \r
     ## Generate GuidedSectionTools.txt in the FV directories.\r
     #\r
@@ -2480,7 +2494,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.01.org for help, attaching following call stack trace!)\n",\r
+                    ExtraData="\n(Please send email to %s for help, attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR,\r
                     RaiseError=False\r
                     )\r
         EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r