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

compilation warnings

Browse source
This commit is contained in:
Andrew Gvozdev 2010-04-28 20:03:14 +00:00
parent 44f53ef53d
commit 97285f3b56
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/jobs/SCJobsUtil.java
View file

@ -30,7 +30,7 @@ import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileMan
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.SafeRunner;
/** /**
* Utility class for build and job related functionality * Utility class for build and job related functionality
@ -55,6 +55,7 @@ public class SCJobsUtil {
this.rc = rc; this.rc = rc;
} }
@Override
public String toString() { public String toString() {
return rc ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$ return rc ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
} }
@ -84,9 +85,9 @@ public class SCJobsUtil {
getSCProfileInstance(project, context, buildInfo.getSelectedProfileId()); getSCProfileInstance(project, context, buildInfo.getSelectedProfileId());
final IScannerInfoCollector collector = profileInstance.getScannerInfoCollector(); final IScannerInfoCollector collector = profileInstance.getScannerInfoCollector();
List providerIds = buildInfo.getProviderIdList(); List<String> providerIds = buildInfo.getProviderIdList();
for (int i = 0; i < providerIds.size(); ++i) { for (int i = 0; i < providerIds.size(); ++i) {
final String providerId = (String) providerIds.get(i); final String providerId = providerIds.get(i);
if (buildInfo.isProviderOutputParserEnabled(providerId)) { if (buildInfo.isProviderOutputParserEnabled(providerId)) {
final IExternalScannerInfoProvider esiProvider = profileInstance. final IExternalScannerInfoProvider esiProvider = profileInstance.
createExternalScannerInfoProvider(providerId); createExternalScannerInfoProvider(providerId);
@ -114,7 +115,7 @@ public class SCJobsUtil {
} }
}; };
Platform.run(runnable); SafeRunner.run(runnable);
} }
} }
} }
@ -165,7 +166,7 @@ public class SCJobsUtil {
} }
}; };
Platform.run(runnable); SafeRunner.run(runnable);
} }
return rc.get(); return rc.get();
@ -215,7 +216,7 @@ public class SCJobsUtil {
} }
}; };
Platform.run(runnable); SafeRunner.run(runnable);
} }
return rc.get(); return rc.get();

12
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2009 IBM Corporation and others. * Copyright (c) 2004, 2010 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
@ -15,7 +15,6 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.Iterator;
import java.util.List; import java.util.List;
import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.MakeCorePlugin;
@ -41,6 +40,7 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider#initialize() * @see org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider#initialize()
*/ */
@Override
protected boolean initialize() { protected boolean initialize() {
String args = buildInfo.getProviderRunArguments(providerId); String args = buildInfo.getProviderRunArguments(providerId);
if (null == args) if (null == args)
@ -69,7 +69,7 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
boolean rc = false; boolean rc = false;
if (collector instanceof IScannerInfoCollector2) { if (collector instanceof IScannerInfoCollector2) {
IScannerInfoCollector2 collector2 = (IScannerInfoCollector2) collector; IScannerInfoCollector2 collector2 = (IScannerInfoCollector2) collector;
List commands = collector2.getCollectedScannerInfo( List<CCommandDSC> commands = collector2.getCollectedScannerInfo(
resource.getProject(), ScannerInfoTypes.UNDISCOVERED_COMPILER_COMMAND); resource.getProject(), ScannerInfoTypes.UNDISCOVERED_COMPILER_COMMAND);
if (commands != null && commands.size() > 0) { if (commands != null && commands.size() > 0) {
@ -79,16 +79,14 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
buffer.append(".PHONY: all"); //$NON-NLS-1$ buffer.append(".PHONY: all"); //$NON-NLS-1$
buffer.append(DENDL); buffer.append(DENDL);
buffer.append("COMMANDS := "); //$NON-NLS-1$ buffer.append("COMMANDS := "); //$NON-NLS-1$
for (Iterator i = commands.iterator(); i.hasNext(); ) { for (CCommandDSC cmd : commands) {
CCommandDSC cmd = (CCommandDSC) i.next();
buffer.append("\t\\"+ENDL+"\t scd_cmd_"); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append("\t\\"+ENDL+"\t scd_cmd_"); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(cmd.getCommandId()); buffer.append(cmd.getCommandId());
} }
buffer.append(DENDL); buffer.append(DENDL);
buffer.append("all: $(COMMANDS)"); //$NON-NLS-1$ buffer.append("all: $(COMMANDS)"); //$NON-NLS-1$
buffer.append(DENDL); buffer.append(DENDL);
for (Iterator i = commands.iterator(); i.hasNext(); ) { for (CCommandDSC cmd : commands) {
CCommandDSC cmd = (CCommandDSC) i.next();
buffer.append("scd_cmd_"); //$NON-NLS-1$ buffer.append("scd_cmd_"); //$NON-NLS-1$
buffer.append(cmd.getCommandId()); buffer.append(cmd.getCommandId());
buffer.append(':'); buffer.append(':');