Sync BaseTools Trunk (version r2518) to EDKII main trunk.

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

diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/Ecc/Ecc.py
index e2e92ef6723ceeb3f2fe680c40da98dbfcf0a811..b1a0ab82723bfa945f4d45c7e10326db45fa44b4 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Ecc.py
+++ b/BaseTools/Source/Python/Ecc/Ecc.py
@@ -28,6 +28,7 @@ from Common.String import NormPath
 from Common.BuildVersion import gBUILD_VERSION\r
 from Common import BuildToolError\r
 from Common.Misc import PathClass\r
+from Common.Misc import DirCache\r
 from MetaFileWorkspace.MetaFileParser import DscParser\r
 from MetaFileWorkspace.MetaFileParser import DecParser\r
 from MetaFileWorkspace.MetaFileParser import InfParser\r
@@ -106,6 +107,11 @@ class Ecc(object):
         EccGlobalData.gDb = Database.Database(Database.DATABASE_PATH)\r
         EccGlobalData.gDb.InitDatabase(self.IsInit)\r
 \r
+        #\r
+        # Get files real name in workspace dir\r
+        #\r
+        GlobalData.gAllFiles = DirCache(GlobalData.gWorkspace)\r
+         \r
         # Build ECC database\r
         self.BuildDatabase()\r
 \r
@@ -137,13 +143,13 @@ class Ecc(object):
         EccGlobalData.gDb.TblReport.Create()\r
 \r
         # Build database\r
-        if self.IsInit:\r
-            if self.ScanSourceCode:\r
-                EdkLogger.quiet("Building database for source code ...")\r
-                c.CollectSourceCodeDataIntoDB(EccGlobalData.gTarget)\r
+        if self.IsInit:            \r
             if self.ScanMetaData:\r
-                EdkLogger.quiet("Building database for source code done!")\r
+                EdkLogger.quiet("Building database for Meta Data File ...")\r
                 self.BuildMetaDataFileDatabase()\r
+            if self.ScanSourceCode:\r
+                EdkLogger.quiet("Building database for Meta Data File Done!")\r
+                c.CollectSourceCodeDataIntoDB(EccGlobalData.gTarget)\r
 \r
         EccGlobalData.gIdentifierTableList = GetTableList((MODEL_FILE_C, MODEL_FILE_H), 'Identifier', EccGlobalData.gDb)\r
         EccGlobalData.gCFileList = GetFileList(MODEL_FILE_C, EccGlobalData.gDb)\r