From 815658b79098c790179e35dfb2f44499ae105b20 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 17 Sep 2009 15:59:19 +0000 Subject: [PATCH] bug 284549: [Scanner Discovery] include path outside workspace may not be scanned in case of conflicting source file name Externalized make messages to provide for localized make --- .../eclipse/cdt/make/internal/core/MakeMessages.properties | 4 ++++ .../core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.properties b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.properties index b088b58976a..5c9587252bd 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.properties +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.properties @@ -9,6 +9,10 @@ # QNX Software Systems - initial API and implementation ############################################################################### +# Those 2 messages are from "make" utility and should be "translated" to localized make messages exactly +AbstractGCCBOPConsoleParser_EnteringDirectory=Entering directory +AbstractGCCBOPConsoleParser_LeavingDirectory=Leaving directory + MakeBuilder.buildError=Error launching builder ({0}) MakeBuilder.Invoking_Make_Builder=Invoking Make Builder... MakeBuilder.Invoking_Command=Invoking Command: diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java index 222a459542d..ccdb17a8db6 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser; +import org.eclipse.cdt.make.internal.core.MakeMessages; import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil; import org.eclipse.cdt.make.internal.core.scannerconfig2.SCProfileInstance; import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager; @@ -123,8 +124,8 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole if (firstColon != -1 && make.indexOf("make") != -1) { //$NON-NLS-1$ boolean enter = false; String msg = line.substring(firstColon + 1).trim(); - if ((enter = msg.startsWith("Entering directory")) || //$NON-NLS-1$ - (msg.startsWith("Leaving directory"))) { //$NON-NLS-1$ + if ((enter = msg.startsWith(MakeMessages.getString("AbstractGCCBOPConsoleParser_EnteringDirectory"))) || //$NON-NLS-1$ + (msg.startsWith(MakeMessages.getString("AbstractGCCBOPConsoleParser_LeavingDirectory")))) { //$NON-NLS-1$ int s = msg.indexOf('`'); int e = msg.indexOf('\''); if (s != -1 && e != -1) { @@ -174,6 +175,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole * A backslash used for escaping is removed. * Quotes other than the back-quote plus '&&', '||', ';' are removed, also. * @param line to tokenize + * @param escapeInsideDoubleQuotes if quotes need to be escaped [\"] in the resulting array of commands * @return array of commands */ protected String[][] tokenize(String line, boolean escapeInsideDoubleQuotes) {