--- a/buildframework/helium/config/metadata_regex.csv	Thu Mar 25 12:47:55 2010 +0000
+++ b/buildframework/helium/config/metadata_regex.csv	Thu Mar 25 14:10:11 2010 +0000
@@ -1,47 +1,66 @@
 priority,regex,description
-FATAL,.*mingw_make\.exe.*,
-ERROR,.*\): Missing file:.*, 
-ERROR,^(?:(?:\s*\d+\)\s*)|(?:\s*\*\*\*\s*))ERROR:.*,
-ERROR,.*Error:\s+.*,
+CRITICAL,.*Error:.*mingw_make\.exe.*,
+ERROR,.*\: cannot create regular file.*,
+ERROR,.*\): Missing file:.*,
+ERROR,(?:(?:\s*\d+\)\s*)|(?:\s*\*\*\*\s*))ERROR:.*,
 ERROR,.*is not recognized as an internal or external command.*,
-ERROR,^MISSING:.*,
+ERROR,MISSING:.*,
 ERROR,.*FLEXlm error:.*,
-ERROR,.*(ABLD|BLDMAKE) ERROR:.*,
+ERROR,.*(ABLD|BLDMAKE)\s*ERROR:.*,
 ERROR,.*FATAL ERROR\(S\):.*,
 ERROR,.*fatal error C1001: INTERNAL COMPILER ERROR.*,
 ERROR,.*fatal error U1077.*,
-ERROR,.*warning U4010,
-ERROR,^make(?:\[\d+\])?\: \*\*\*.*,
-ERROR,^make(?:\[\d+\])?:\s+.*\s+not\s+remade.*,
-ERROR,error: ((Internal fault):)$,
+ERROR,^fatal error.*,
+ERROR,.*warning U4010.*,
+ERROR,make(?:\.exe)?\s*(?:\[\d+\])\s*?\:\s*\*\*\*.*,
+ERROR,make(?:\.exe)(?:\[\d+\])?\:.*\s+not\s+remade.*,
+ERROR,make(?:\.exe)\s*:\s*\*\*\*.*\s*[Nn]o rule.*,
+ERROR,"\""(?:.*)\"" , line (\d+): (Error: +(.\d+.*?):.*)",
+ERROR,error: ((Internal fault):.*)$,
+ERROR,.*Exception: STATUS_ACCESS_VIOLATION.*,
+ERROR,.*target .* given more than once in the same rule.*,
+ERROR,ERROR:.*,
+ERROR,Error:.*,
+ERROR,ERROR\t.*,
+ERROR,^.*\s*elf2e32\s*:\s*Error\s*:\s*,
+ERROR,.*[Nn]o such file or directory\s*.*,
 ERROR,Exception: [A-Z0-9_]+.*,
 ERROR,.*target .* given more than once in the same rule.*,
-ERROR,^ERROR:.*,
-ERROR,^ERROR EC\d+:.*,
+ERROR,ERROR EC\d+:.*,
 ERROR,Errors caused tool to abort..*,
-ERROR,.*no rule to make.*,
-ERROR,^ERROR\t.*,
+ERROR,ERROR\t.*,
 ERROR,.*Traceback \(most recent call last\).*,
-CRITICAL,[Ww]arning:?\s+(#111-D|#1166-D|#117-D|#128-D|#1293-D|#1441-D|#170-D|#174-D|#175-D|#185-D|#186-D|#223-D|#231-D|#257-D|#284-D|#368-D|#414-D|#430-D|#47-D|#514-D|#546-D|#68-D|#69-D|#830-D|#940-D|#836-D|A1495E|L6318W|C2874W|C4127|C4355|C4530|C4702|C4786|LNK4049),
-WARNING,^(\d+\))?\s.*WARNING:.*,
-WARNING,^MAKEDEF WARNING:.*,
-WARNING,.*\\\\(?)\(\d+\)\s:\sWarning:\s\(\d+\),
-WARNING,^(BLDMAKE |MAKEDEF )?WARNING:.*,
+ERROR,Application encountered an unexpected error\.\s*Stopping\.\s*,
+ERROR,Unable to write dump file .+,
+ERROR,Unable to connect to CM: .*,
+ERROR,.*: Incorrect slash in .*,
+ERROR,.*: Incorrect case for epoc32 tree in .*,
+ERROR,.*: Incorrect case versus exclusion list in .*,
+ERROR,The system cannot find the path specified.*,
+CRITICAL,.*[Ww]arning:?\s+(#111-D|#1166-D|#117-D|#128-D|#1293-D|#1441-D|#170-D|#174-D|#175-D|#185-D|#186-D|#223-D|#231-D|#257-D|#284-D|#368-D|#414-D|#430-D|#47-D|#514-D|#546-D|#68-D|#69-D|#830-D|#940-D|#836-D|A1495E|L6318W|C2874W|C4127|C4355|C4530|C4702|C4786|LNK4049).*,
+WARNING,.*\\\\(?)\(\d+\)\s:\sWarning:\s\(\d+\).*,
+WARNING,(\d+\))?\s.*WARNING:.*,
+WARNING,(BLDMAKE |MAKEDEF )?WARNING:.*,
 WARNING,.*\(\d+\) : warning C.*,
 WARNING,.*\d+: warning:.*,
 WARNING,.*Usage Warning:.*,
 WARNING,.*mwld.exe:.*,
-WARNING,^Command line warning.*,
+WARNING,Command line warning.*,
 WARNING,.*ERROR: bad relocation:.*,
-WARNING,^(\d+) warning.*,
+WARNING,(\d+) warning.*,
 WARNING,.*EventType:\s+Error\s+Source:\s+SweepNT.*,
-WARNING,^WARN\t.*,
+WARNING,WARN\t.*,
 WARNING,.*LINK : warning.*,
+WARNING,.*\s*elf2e32\s*:\s*Warning\s*:\s*,
+WARNING,Warning:.*,
+REMARK,"\"".*\""\, line \d+: Warning: +(.\d+.*?):.*",
 REMARK,.*Command line warning D4025 : .*,
-REMARK,^REMARK: .*,
-REMARK,^EventType:\s+Error\s+Source:\s+GNU\s+Make.*,
-REMARK,".*:\d+: warning: cannot find matching deallocation function""r""((:\d+)*: note: ).*",
-INFO,^INFO:.*,
-ERROR,"\""(.*)\"" , line (\d+): (Error: +(.\d+.*?):.*)$",
-WARNING,"line \d+: Warning:', r':\s+warning\s+\w+:.*",
-WARNING,"\""(.*)\""\, line (\d+): (Warning: +(?!A1495E)(.\d+.*?):.*)$",
\ No newline at end of file
+REMARK,REMARK: .*,
+REMARK,EventType:\s+Error\s+Source:\s+GNU\s+Make.*,
+REMARK,".*:\d+: warning: cannot find matching deallocation function.*",
+REMARK,(:\d+)*: note: .*,
+INFO,INFO:.*,
+WARNING,"line \d+: Warning:'\, r':\s+warning\s+\w+:.*",
+WARNING,"\""(.*)\""\, line (\d+): (Warning: +(?!A1495E)(.\d+.*?):.*)",
+WARNING,Warning\s*:\s*.*,
+ERROR,.*Error\s*:\s*.*,
\ No newline at end of file