# Keep the file to be checked\r
headerFileDependencySet.add(aFileName)\r
\r
- # Ensure that gModuleBuildTracking has been initialized per architecture\r
- if self._AutoGenObject.Arch not in GlobalData.gModuleBuildTracking:\r
- GlobalData.gModuleBuildTracking[self._AutoGenObject.Arch] = dict()\r
-\r
# Check if a module dependency header file is missing from the module's MetaFile\r
for aFile in headerFileDependencySet:\r
if aFile in headerFilesInMetaFileSet:\r
continue\r
if GlobalData.gUseHashCache:\r
- GlobalData.gModuleBuildTracking[self._AutoGenObject.Arch][self._AutoGenObject] = 'FAIL_METAFILE'\r
+ GlobalData.gModuleBuildTracking[self._AutoGenObject] = 'FAIL_METAFILE'\r
EdkLogger.warn("build","Module MetaFile [Sources] is missing local header!",\r
ExtraData = "Local Header: " + aFile + " not found in " + self._AutoGenObject.MetaFile.Path\r
)\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
+ if (self.BuildItem.BuildObject in GlobalData.gModuleBuildTracking and\r
+ GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject] != 'FAIL_METAFILE' and\r
not BuildTask._ErrorFlag.isSet()\r
):\r
- GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject.Arch][self.BuildItem.BuildObject] = 'SUCCESS'\r
+ GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject] = 'SUCCESS'\r
\r
# indicate there's a thread is available for another build task\r
BuildTask._RunningQueueLock.acquire()\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
+ for Ma in GlobalData.gModuleBuildTracking:\r
+ # Skip invalidating for Successful Module/Lib builds\r
+ if GlobalData.gModuleBuildTracking[Ma] == 'SUCCESS':\r
+ continue\r
\r
- # The module failed to build, failed to start building, or failed the header check test 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
- ModuleHashFile = os.path.join(moduleAutoGenObj.BuildDir, moduleAutoGenObj.Name + ".hash")\r
- if os.path.exists(ModuleHashFile):\r
- os.remove(ModuleHashFile)\r
+ # Remove .hash from build\r
+ ModuleHashFile = os.path.join(Ma.BuildDir, Ma.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 = 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
+ # Remove .hash file from cache\r
+ if GlobalData.gBinCacheDest:\r
+ FileDir = os.path.join(GlobalData.gBinCacheDest, Ma.PlatformInfo.OutputDir, Ma.BuildTarget + "_" + Ma.ToolChain, Ma.Arch, Ma.SourceDir, Ma.MetaFile.BaseName)\r
+ HashFile = os.path.join(FileDir, Ma.Name + '.hash')\r
+ if os.path.exists(HashFile):\r
+ os.remove(HashFile)\r
\r
## Build a module or platform\r
#\r
\r
self.BuildModules.append(Ma)\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
+ GlobalData.gModuleBuildTracking[Ma] = 'FAIL'\r
self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
MakeStart = time.time()\r
for Ma in self.BuildModules:\r
PcdMaList.append(Ma)\r
TotalModules.append(Ma)\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
+ GlobalData.gModuleBuildTracking[Ma] = 'FAIL'\r
\r
mqueue = mp.Queue()\r
for m in Pa.GetAllModuleInfo:\r