From 19a8eda676630f075f0b8bc953948a5f58c9dbbd Mon Sep 17 00:00:00 2001 From: Vladimir Hirsl Date: Tue, 16 Nov 2004 21:53:22 +0000 Subject: [PATCH] Fix for PR 78792 [Scanner Config] Include paths not discovered from build output of Ethereal project. Fixed ambiguous (prefix & postfix based) source file name detection. --- .../gnu/GCCScannerInfoConsoleParser.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java index 6cd1f733449..a6c23b4432c 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java @@ -119,17 +119,17 @@ public class GCCScannerInfoConsoleParser implements IScannerInfoConsoleParser { if (!targetSpecificOptions.contains(token)) targetSpecificOptions.add(token); } - else { + else if (fileName == null) { String possibleFileName = token.toLowerCase(); - if (possibleFileName.startsWith("..") || //$NON-NLS-1$ - possibleFileName.startsWith(".") || //$NON-NLS-1$ - possibleFileName.startsWith("/") || //$NON-NLS-1$ - possibleFileName.endsWith(".c") || //$NON-NLS-1$ + if (possibleFileName.endsWith(".c") || //$NON-NLS-1$ possibleFileName.endsWith(".cpp") || //$NON-NLS-1$ possibleFileName.endsWith(".cc") || //$NON-NLS-1$ possibleFileName.endsWith(".cxx") || //$NON-NLS-1$ possibleFileName.endsWith(".C") || //$NON-NLS-1$ - possibleFileName.endsWith(".CC")) { //$NON-NLS-1$ + possibleFileName.endsWith(".CPP") || //$NON-NLS-1$ + possibleFileName.endsWith(".CC") || //$NON-NLS-1$ + possibleFileName.endsWith(".CXX") || //$NON-NLS-1$ + possibleFileName.endsWith(".c++")) { //$NON-NLS-1$ fileName = token; }