mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-15 04:05:38 +02:00
Code Issues Wiki Activity

bug 284549: [Scanner Discovery] include path outside workspace may not be scanned in case of conflicting source file name

Browse source 
Externalized make messages to provide for localized make
This commit is contained in:
Andrew Gvozdev 2009-09-17 15:59:19 +00:00
parent 4a6aa530bc
commit 815658b790
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.properties
View file

@ -9,6 +9,10 @@
# QNX Software Systems - initial API and implementation # 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.buildError=Error launching builder ({0})
MakeBuilder.Invoking_Make_Builder=Invoking Make Builder... MakeBuilder.Invoking_Make_Builder=Invoking Make Builder...
MakeBuilder.Invoking_Command=Invoking Command: MakeBuilder.Invoking_Command=Invoking Command:

6
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java
View file

@ -16,6 +16,7 @@ import java.util.ArrayList;
import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector; import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector;
import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser; 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.scannerconfig.util.TraceUtil;
import org.eclipse.cdt.make.internal.core.scannerconfig2.SCProfileInstance; import org.eclipse.cdt.make.internal.core.scannerconfig2.SCProfileInstance;
import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager; 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$ if (firstColon != -1 && make.indexOf("make") != -1) { //$NON-NLS-1$
boolean enter = false; boolean enter = false;
String msg = line.substring(firstColon + 1).trim(); String msg = line.substring(firstColon + 1).trim();
if ((enter = msg.startsWith("Entering directory")) || //$NON-NLS-1$ if ((enter = msg.startsWith(MakeMessages.getString("AbstractGCCBOPConsoleParser_EnteringDirectory"))) || //$NON-NLS-1$
(msg.startsWith("Leaving directory"))) { //$NON-NLS-1$ (msg.startsWith(MakeMessages.getString("AbstractGCCBOPConsoleParser_LeavingDirectory")))) { //$NON-NLS-1$
int s = msg.indexOf('`'); int s = msg.indexOf('`');
int e = msg.indexOf('\''); int e = msg.indexOf('\'');
if (s != -1 && e != -1) { if (s != -1 && e != -1) {
@ -174,6 +175,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole
* A backslash used for escaping is removed. * A backslash used for escaping is removed.
* Quotes other than the back-quote plus '&&', '||', ';' are removed, also. * Quotes other than the back-quote plus '&&', '||', ';' are removed, also.
* @param line to tokenize * @param line to tokenize
* @param escapeInsideDoubleQuotes if quotes need to be escaped [\"] in the resulting array of commands
* @return array of commands * @return array of commands
*/ */
protected String[][] tokenize(String line, boolean escapeInsideDoubleQuotes) { protected String[][] tokenize(String line, boolean escapeInsideDoubleQuotes) {