diff options
author | Vivian Kong | 2011-01-28 16:36:58 +0000 |
---|---|---|
committer | Vivian Kong | 2011-01-28 16:36:58 +0000 |
commit | c62c6e671eb788de195c486d61f29f483d43b347 (patch) | |
tree | 1cbdd5ec443195c9684ac80db8e0f30b155b1992 /xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt | |
parent | 3f7e96cb4bb63f1ee2d8a0f2ba992d38103f7a41 (diff) | |
download | org.eclipse.cdt-c62c6e671eb788de195c486d61f29f483d43b347.tar.gz org.eclipse.cdt-c62c6e671eb788de195c486d61f29f483d43b347.tar.xz org.eclipse.cdt-c62c6e671eb788de195c486d61f29f483d43b347.zip |
Bug 335512 - Update XLC scanning discovery parser and marcos and include path import XML utility accessible scope (for John Liu)
Diffstat (limited to 'xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt')
3 files changed, 19 insertions, 7 deletions
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java index 949dba67987..8bbacedb0c4 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java +++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -132,7 +132,11 @@ public abstract class AbstractXLCBuildOutputParser implements IScannerInfoConsol fSMultiline = ""; //$NON-NLS-1$ } line = line.trim(); - TraceUtil.outputTrace("XLCBuildOutputParser parsing line: [", line, "]"); //$NON-NLS-1$ //$NON-NLS-2$ + try{ + TraceUtil.outputTrace("XLCBuildOutputParser parsing line: [", line, "]"); //$NON-NLS-1$ //$NON-NLS-2$ + }catch(NoClassDefFoundError e){ + //no problem, as this may be called from a standalone indexer + } // make\[[0-9]*\]: error_desc int firstColon = line.indexOf(':'); String make = line.substring(0, firstColon + 1); diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCBuildOutputParserUtility.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCBuildOutputParserUtility.java index 72f56a102c9..88853204425 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCBuildOutputParserUtility.java +++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCBuildOutputParserUtility.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -95,6 +95,15 @@ public class XLCBuildOutputParserUtility { private List<String> fCollectedFiles; private List<String> fNameConflicts; + protected XLCBuildOutputParserUtility(IPath baseDirectory, IPath workingDirectory){ + fDirectoryStack = new Vector<IPath>(); + fErrors = new ArrayList<Problem>(); + this.fBaseDirectory = baseDirectory; + if (workingDirectory != null) { + pushDirectory(workingDirectory); + } + + } /** * */ diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCPerFileBuildOutputParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCPerFileBuildOutputParser.java index 823ec64c861..3482c1a790c 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCPerFileBuildOutputParser.java +++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCPerFileBuildOutputParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. + * Copyright (c) 2009, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.cdt.make.xlc.core.scannerconfig; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -180,7 +179,7 @@ public class XLCPerFileBuildOutputParser extends AbstractXLCBuildOutputParser { } } - private String getAutoMakeSourcePath(String string) { + protected String getAutoMakeSourcePath(String string) { // path may be enclosed in single quotes int firstQuoteIndex = string.indexOf('\''); int lastQuoteIndex = string.lastIndexOf('\''); @@ -196,7 +195,7 @@ public class XLCPerFileBuildOutputParser extends AbstractXLCBuildOutputParser { return null; } - private int findAutoMakeSourceIndex(String[] tokens) { + protected int findAutoMakeSourceIndex(String[] tokens) { for (int i = 0; i < tokens.length; i++) { final String token = tokens[i].toLowerCase(); if(token.indexOf("source=") != -1) //$NON-NLS-1$ |