1. Add a switch to enable/disable error raise for EdkLogger

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1058 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/Python/Common/EdkLogger.py b/Source/Python/Common/EdkLogger.py
index c792490..6f37165 100644 (file)
--- a/Source/Python/Common/EdkLogger.py
+++ b/Source/Python/Common/EdkLogger.py
@@ -33,6 +33,8 @@ WARN    = 30
 QUIET   = 40
 ERROR   = 50
 
+IsRaiseError = True
+
 # For validation purpose
 _LogLevels = [DEBUG_0, DEBUG_1, DEBUG_2, DEBUG_3, DEBUG_4, DEBUG_5, DEBUG_6, DEBUG_7, DEBUG_8, DEBUG_9, VERBOSE, WARN, INFO, ERROR, QUIET]
 

diff --git a/Source/Python/Common/String.py b/Source/Python/Common/String.py
index 8425d3e..db00811 100644 (file)
--- a/Source/Python/Common/String.py
+++ b/Source/Python/Common/String.py
@@ -410,7 +410,7 @@ def PreCheck(FileName, FileContent, SupSectionTag):
         #\r
         if Line.find('$') > -1:\r
             if Line.find('$(') < 0 or Line.find(')') < 0:\r
-                EdkLogger.error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName)\r
+                EdkLogger.error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError = EdkLogger.IsRaiseError)\r
 \r
         #\r
         # Check []\r
@@ -420,7 +420,7 @@ def PreCheck(FileName, FileContent, SupSectionTag):
             # Only get one '[' or one ']'\r
             #\r
             if not (Line.find('[') > -1 and Line.find(']') > -1):\r
-                EdkLogger.error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName)\r
+                EdkLogger.error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError = EdkLogger.IsRaiseError)\r
         \r
         #\r
         # Regenerate FileContent\r
@@ -428,7 +428,7 @@ def PreCheck(FileName, FileContent, SupSectionTag):
         NewFileContent = NewFileContent + Line + '\r\n'\r
 \r
     if IsFailed:\r
-       EdkLogger.error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName)\r
+       EdkLogger.error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError = EdkLogger.IsRaiseError)\r
     \r
     return NewFileContent\r
 \r
@@ -455,7 +455,7 @@ def CheckFileType(CheckFilename, ExtName, ContainerFilename, SectionName, Line,
                 LineNo = GetLineNo(ContainerFile, Line)\r
             ErrorMsg = "Invalid %s. '%s' is found, but '%s' file is needed" % (SectionName, CheckFilename, ExtName)\r
             EdkLogger.error("Parser", PARSER_ERROR, ErrorMsg, Line=LineNo,\r
-                            File=ContainerFilename)\r
+                            File=ContainerFilename, RaiseError = EdkLogger.IsRaiseError)\r
 \r
     return True\r
 \r
@@ -483,7 +483,7 @@ def CheckFileExist(WorkspaceDir, CheckFilename, ContainerFilename, SectionName,
                 LineNo = GetLineNo(ContainerFile, Line)\r
             ErrorMsg = "Can't find file '%s' defined in section '%s'" % (CheckFile, SectionName)\r
             EdkLogger.error("Parser", PARSER_ERROR, ErrorMsg,\r
-                            File=ContainerFilename, Line=LineNo)\r
+                            File=ContainerFilename, Line = LineNo, RaiseError = EdkLogger.IsRaiseError)\r
 \r
     return CheckFile\r
 \r
@@ -526,7 +526,7 @@ def RaiseParserError(Line, Section, File, Format = '', LineNo = -1):
     ErrorMsg = "Invalid statement '%s' is found in section '%s'" % (Line, Section)\r
     if Format != '':\r
         Format = "Correct format is " + Format\r
-    EdkLogger.error("Parser", PARSER_ERROR, ErrorMsg, File=File, Line=LineNo, ExtraData=Format)\r
+    EdkLogger.error("Parser", PARSER_ERROR, ErrorMsg, File=File, Line=LineNo, ExtraData=Format, RaiseError = EdkLogger.IsRaiseError)\r
 \r
 ## WorkspaceFile\r
 #\r

diff --git a/Source/Python/Ecc/Check.py b/Source/Python/Ecc/Check.py
index a1ca217..3029096 100644 (file)
--- a/Source/Python/Ecc/Check.py
+++ b/Source/Python/Ecc/Check.py
@@ -52,6 +52,7 @@ class Check(object):
     #\r
     def MetaDataFileCheckPathName(self):\r
         if EccGlobalData.gConfig.MetaDataFileCheckPathName == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1':\r
+            # This item is covered when parsing INF/DEC/DSC files\r
             pass\r
     \r
     #\r
@@ -59,7 +60,7 @@ class Check(object):
     #\r
     def MetaDataFileCheckGenerateFileList(self):\r
         if EccGlobalData.gConfig.MetaDataFileCheckGenerateFileList == '1' or EccGlobalData.gConfig.MetaDataFileCheckAll == '1':\r
-            File = EccGlobalData.gConfig.MetaDataFileCheckPathOfGenerateFileList\r
+            # This item is covered when parsing INF/DEC/DSC files\r
             pass\r
     \r
     #\r

diff --git a/Source/Python/Ecc/Ecc.py b/Source/Python/Ecc/Ecc.py
index 3ffb370..5e3a9da 100644 (file)
--- a/Source/Python/Ecc/Ecc.py
+++ b/Source/Python/Ecc/Ecc.py
@@ -47,6 +47,7 @@ class Ecc(object):
         # Initialize log system\r
         #\r
         EdkLogger.Initialize()\r
+        EdkLogger.IsRaiseError = False\r
         EdkLogger.quiet(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime()) + "[00:00]" + "\n")\r
         \r
         #\r