mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 335512 - Update XLC scanning discovery parser and marcos and include path import XML utility accessible scope (for John Liu)

Browse source
This commit is contained in:
Vivian Kong 2011-01-28 16:36:58 +00:00
parent 3f7e96cb4b
commit c62c6e671e
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/XMLUtils.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008 IBM Corporation and others. * Copyright (c) 2008, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -18,7 +18,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.w3c.dom.Text; import org.w3c.dom.Text;
class XMLUtils { public class XMLUtils {
private XMLUtils() {} private XMLUtils() {}

2
xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.make.xlc.core;singleton:=true Bundle-SymbolicName: org.eclipse.cdt.make.xlc.core;singleton:=true
Bundle-Version: 5.0.0.qualifier Bundle-Version: 5.1.0.qualifier
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.cdt.make.core, Require-Bundle: org.eclipse.cdt.make.core,

8
xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/AbstractXLCBuildOutputParser.java
View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -132,7 +132,11 @@ public abstract class AbstractXLCBuildOutputParser implements IScannerInfoConsol
fSMultiline = ""; //$NON-NLS-1$ fSMultiline = ""; //$NON-NLS-1$
} }
line = line.trim(); 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 // make\[[0-9]*\]: error_desc
int firstColon = line.indexOf(':'); int firstColon = line.indexOf(':');
String make = line.substring(0, firstColon + 1); String make = line.substring(0, firstColon + 1);

11
xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCBuildOutputParserUtility.java
View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -95,6 +95,15 @@ public class XLCBuildOutputParserUtility {
private List<String> fCollectedFiles; private List<String> fCollectedFiles;
private List<String> fNameConflicts; 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);
}
}
/** /**
* *
*/ */

7
xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XLCPerFileBuildOutputParser.java
View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; 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 // path may be enclosed in single quotes
int firstQuoteIndex = string.indexOf('\''); int firstQuoteIndex = string.indexOf('\'');
int lastQuoteIndex = string.lastIndexOf('\''); int lastQuoteIndex = string.lastIndexOf('\'');
@ -196,7 +195,7 @@ public class XLCPerFileBuildOutputParser extends AbstractXLCBuildOutputParser {
return null; return null;
} }
private int findAutoMakeSourceIndex(String[] tokens) { protected int findAutoMakeSourceIndex(String[] tokens) {
for (int i = 0; i < tokens.length; i++) { for (int i = 0; i < tokens.length; i++) {
final String token = tokens[i].toLowerCase(); final String token = tokens[i].toLowerCase();
if(token.indexOf("source=") != -1) //$NON-NLS-1$ if(token.indexOf("source=") != -1) //$NON-NLS-1$