mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

bug 319512: compilation warnings

Browse source
This commit is contained in:
Andrew Gvozdev 2010-07-21 04:10:41 +00:00
parent 459affd72f
commit 6fc9f2b2bf
3 changed files with 48 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildCPathEntryContainer.java
View file

@ -11,10 +11,10 @@
package org.eclipse.cdt.managedbuilder.internal.scannerconfig;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Vector;
import org.eclipse.cdt.build.internal.core.scannerconfig2.CfgScannerConfigProfileManager;
@ -46,28 +46,28 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
/**
* Implements a specialized path container for managed build projects. It will
* either start the dynamic path collector specified for a target in the tool
* manifest, or it will attempt to discover the built-in values specified in
* Implements a specialized path container for managed build projects. It will
* either start the dynamic path collector specified for a target in the tool
* manifest, or it will attempt to discover the built-in values specified in
* the manifest.
*
*
* @since 2.0
*/
public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
// Managed make per project scanner configuration discovery profile
public static final String MM_PP_DISCOVERY_PROFILE_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".GCCManagedMakePerProjectProfile"; //$NON-NLS-1$
private static final String NEWLINE = System.getProperty("line.separator"); //$NON-NLS-1$
private static final String ERROR_HEADER = "PathEntryContainer error ["; //$NON-NLS-1$
private static final String TRACE_FOOTER = "]: "; //$NON-NLS-1$
private static final String TRACE_HEADER = "PathEntryContainer trace ["; //$NON-NLS-1$
private ITarget defaultTarget;
private Vector entries;
private Vector<IPathEntry> entries;
private IProject project;
private ManagedBuildInfo info;
public static boolean VERBOSE = false;
public static void outputTrace(String resourceName, String message) {
if (VERBOSE) {
System.out.println(TRACE_HEADER + resourceName + TRACE_FOOTER + message + NEWLINE);
@ -81,48 +81,41 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
}
/**
* Creates a new path container for the managed buildd project.
*
* @param info the build information associated with the project
* Creates a new path container for the managed build project.
*/
public ManagedBuildCPathEntryContainer(IProject project) {
super();
this.project = project;
entries = new Vector();
entries = new Vector<IPathEntry>();
}
protected void addDefinedSymbols(Map definedSymbols) {
protected void addDefinedSymbols(Map<String, String> definedSymbols) {
// Add a new macro entry for each defined symbol
Iterator keyIter = definedSymbols.keySet().iterator();
while (keyIter.hasNext()) {
Set<String> macros = definedSymbols.keySet();
for (String macro : macros) {
boolean add = true;
String macro = (String) keyIter.next();
String value = (String) definedSymbols.get(macro);
String value = definedSymbols.get(macro);
// Make sure the current entries do not contain a duplicate
Iterator entryIter = entries.listIterator();
while (entryIter.hasNext()) {
IPathEntry entry = (IPathEntry) entryIter.next();
if (entry.getEntryKind() == IPathEntry.CDT_MACRO) {
if (((IMacroEntry)entry).getMacroName().equals(macro) &&
for (IPathEntry entry : entries) {
if (entry.getEntryKind() == IPathEntry.CDT_MACRO) {
if (((IMacroEntry)entry).getMacroName().equals(macro) &&
((IMacroEntry)entry).getMacroValue().equals(value)) {
add = false;
break;
}
}
}
if (add) {
entries.add(CoreModel.newMacroEntry(Path.EMPTY, macro, value));
}
}
}
protected void addIncludePaths(List paths) {
protected void addIncludePaths(List<String> paths) {
// A little checking is needed to avoid adding duplicates
Iterator pathIter = paths.listIterator();
while (pathIter.hasNext()) {
String path = (String) pathIter.next();
for (String path : paths) {
IPathEntry entry = CoreModel.newIncludeEntry(Path.EMPTY, Path.EMPTY, new Path(path), true);
if (!entries.contains(entry)) {
entries.add(entry);
@ -130,21 +123,20 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
}
}
protected void calculateEntriesDynamically(final IProject project,
SCProfileInstance profileInstance,
protected void calculateEntriesDynamically(final IProject project,
SCProfileInstance profileInstance,
final IScannerInfoCollector collector) {
// TODO Get the provider from the toolchain specification
final IScannerConfigBuilderInfo2 buildInfo = ScannerConfigProfileManager.
createScannerConfigBuildInfo2(ManagedBuilderCorePlugin.getDefault().getPluginPreferences(),
profileInstance.getProfile().getId(), false);
List providerIds = buildInfo.getProviderIdList();
for (Iterator i = providerIds.iterator(); i.hasNext(); ) {
final String providerId = (String) i.next();
List<String> providerIds = buildInfo.getProviderIdList();
for (final String providerId : providerIds) {
final IExternalScannerInfoProvider esiProvider = profileInstance.createExternalScannerInfoProvider(providerId);
// Set the arguments for the provider
ISafeRunnable runnable = new ISafeRunnable() {
public void run() {
IProgressMonitor monitor = new NullProgressMonitor();
@ -157,7 +149,7 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
env.put(vars[i].getName(), vars[i].getValue());
esiProvider.invokeProvider(monitor, project, providerId, buildInfo, collector/*, env*/);
}
public void handleException(Throwable exception) {
if (exception instanceof OperationCanceledException) {
throw (OperationCanceledException) exception;
@ -175,13 +167,13 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
info = (ManagedBuildInfo) ManagedBuildManager.getBuildInfo(project);
if (info == null) {
ManagedBuildCPathEntryContainer.outputError(project.getName(), "Build information is null"); //$NON-NLS-1$
return (IPathEntry[])entries.toArray(new IPathEntry[entries.size()]);
return entries.toArray(new IPathEntry[entries.size()]);
}
IConfiguration defaultConfig = info.getDefaultConfiguration();
if (defaultConfig == null) {
// The build information has not been loaded yet
ManagedBuildCPathEntryContainer.outputError(project.getName(), "Build information has not been loaded yet"); //$NON-NLS-1$
return (IPathEntry[])entries.toArray(new IPathEntry[entries.size()]);
return entries.toArray(new IPathEntry[entries.size()]);
}
// get the associated scanner config discovery profile id
String scdProfileId = ManagedBuildManager.getScannerInfoProfileId(defaultConfig);
@ -195,7 +187,7 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
getSCProfileInstance(project, context, scdProfileId);
collector = profileInstance.createScannerInfoCollector();
}
synchronized(this) {
if (collector instanceof IManagedScannerInfoCollector) {
IManagedScannerInfoCollector mCollector = (IManagedScannerInfoCollector) collector;
@ -213,36 +205,33 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
ManagedBuildCPathEntryContainer.outputTrace(project.getName(), "Path entries set using built-in definitions from " + defaultConfig.getName()); //$NON-NLS-1$
} else {
ManagedBuildCPathEntryContainer.outputError(project.getName(), "Configuration is null"); //$NON-NLS-1$
return (IPathEntry[])entries.toArray(new IPathEntry[entries.size()]);
return entries.toArray(new IPathEntry[entries.size()]);
}
}
return (IPathEntry[])entries.toArray(new IPathEntry[entries.size()]);
return entries.toArray(new IPathEntry[entries.size()]);
} // end synchronized
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.IPathEntryContainer#getDescription()
*/
public String getDescription() {
return "CDT Managed Build Project"; //$NON-NLS-1$
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.IPathEntryContainer#getPath()
*/
public IPath getPath() {
return new Path("org.eclipse.cdt.managedbuilder.MANAGED_CONTAINER"); //$NON-NLS-1$
}
/**
* @param values
*/
private void addEntries(IPathEntry[] values) {
if (values == null) return;
for (int i=0; i<values.length; i++) {
if (values[i] == null) continue;
if (!entries.contains(values[i])) { entries.add(values[i]); }
}
}
}
}

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/scannerconfig/IManagedScannerInfoCollector.java
View file

@ -41,12 +41,10 @@ public interface IManagedScannerInfoCollector extends IScannerInfoCollector {
*
* @return a <code>List</code> of built-in compiler include search paths.
*/
public List getIncludePaths();
public List<String> getIncludePaths();
/**
* Sets the <code>IProject</code> for the receiver.
*
* @param project
*/
public void setProject(IProject project);
}

16
xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java
View file

@ -189,7 +189,6 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
for (ICLanguageSettingEntry entry : entries) {
if (((CMacroEntry) entry).getName().equals(symbol)) {
int flags = entry.getFlags();
symbolFound = true; // it's already there, so don't set it
break;
}
@ -269,11 +268,11 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
}
}
public Map getPathInfoMap() {
public Map<IResource, PathInfo> getPathInfoMap() {
synchronized (fLock) {
IPerFileDiscoveredPathInfo2 info1 = getPerFileInfo1();
if (info1 != null) {
Map map = new HashMap();
Map<IResource, PathInfo> map = new HashMap<IResource, PathInfo>();
map.putAll(info1.getPathInfoMap());
map.putAll(fInfo2.getPathInfoMap());
return map;
@ -383,7 +382,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
}
}
public Map getSymbols(IPath path) {
public Map<String, String> getSymbols(IPath path) {
synchronized (fLock) {
Map<String, String> symbols = new HashMap<String, String>();
@ -439,7 +438,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
return fInfo2.getSerializable();
}
public Map getSymbols() {
public Map<String, String> getSymbols() {
synchronized (fLock) {
return fInfo1.getSymbols();
}
@ -630,9 +629,8 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
// get the command
CCommandDSC cmd = getCommand(path);
if (cmd != null && cmd.isDiscovered()) {
List symbols = cmd.getSymbols();
for (Iterator i = symbols.iterator(); i.hasNext();) {
String symbol = (String) i.next();
List<String> symbols = cmd.getSymbols();
for (String symbol : symbols) {
String key = ScannerConfigUtil.getSymbolKey(symbol);
String value = ScannerConfigUtil.getSymbolValue(symbol);
definedSymbols.put(key, value);
@ -1520,7 +1518,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector#getIncludePaths()
*/
public List getIncludePaths() {
public List<String> getIncludePaths() {
synchronized (fLock) {
List<String> pathStrings = new LinkedList<String>();