From 0d43fd79c54500ded64f05dbf2f9787e6c413fcf Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Sat, 16 May 2009 23:55:21 +0000 Subject: [PATCH] Bug 276604 - Add WARNING: as valid warning header in gnu make error messages. --- .../org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java | 2 +- .../org/eclipse/cdt/internal/errorparsers/messages.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java index 9150c036104..c9666bc8099 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java @@ -53,7 +53,7 @@ public class GCCErrorParser extends AbstractErrorParser { @Override public int getSeverity(Matcher matcher) { String warningGroup = matcher.group(4); - if (warningGroup != null && warningGroup.indexOf("arning") >= 0) //$NON-NLS-1$ + if (warningGroup != null && warningGroup.toLowerCase().endsWith("warning:")) //$NON-NLS-1$ return IMarkerGenerator.SEVERITY_WARNING; return IMarkerGenerator.SEVERITY_ERROR_RESOURCE; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties index 59d6427632e..4b0221e8f70 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties @@ -16,7 +16,7 @@ GCCErrorParser_skip_UndeclaredOnlyOnce=\\(Each undeclared identifier is reported GCCErrorParser_skip_forEachFunction=for each function it appears in.\\) GCCErrorParser_skip_note=: note: GCCErrorParser_sikp_instantiatedFromHere=instantiated from -GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*[([Ww]arning)([Ee]rror)]:)? (.*) +GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*[([Ww]arning)(WARNING)([Ee]rror)]:)? (.*) GLDErrorParser_error_text=(.*)\\(\\.text\\+.*\\): (.*) GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*) GLDErrorParser_error_general=ld(\\.exe)?: (.*)