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 319512: Compilation warnings

Browse source
This commit is contained in:
Andrew Gvozdev 2010-07-27 20:19:51 +00:00
parent d26f20e557
commit 223d219a8f
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java
View file

@ -22,20 +22,17 @@ import org.eclipse.core.runtime.IPath;
public class BuildCommand implements IBuildCommand { public class BuildCommand implements IBuildCommand {
private IPath fCmd; private IPath fCmd;
private String fArgs[]; private String fArgs[];
private Map fEnv; private Map<String, String> fEnv;
private IPath fCWD; private IPath fCWD;
private BuildStep fStep;
public BuildCommand(IPath cmd, String args[], Map env, IPath cwd, BuildStep step){ public BuildCommand(IPath cmd, String args[], Map<String, String> env, IPath cwd, BuildStep step){
fCmd = cmd; fCmd = cmd;
if(args != null) if(args != null)
fArgs = args.clone(); fArgs = args.clone();
if(env != null) if(env != null)
fEnv = new HashMap(env); fEnv = new HashMap<String, String>(env);
fCWD = cwd; fCWD = cwd;
fStep = step;
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -57,9 +54,9 @@ public class BuildCommand implements IBuildCommand {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.builddescription.IBuildCommand#getEnvironment() * @see org.eclipse.cdt.managedbuilder.builddescription.IBuildCommand#getEnvironment()
*/ */
public Map getEnvironment() { public Map<String, String> getEnvironment() {
if(fEnv != null) if(fEnv != null)
return new HashMap(fEnv); return new HashMap<String, String>(fEnv);
return null; return null;
} }

29
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java
View file

@ -14,9 +14,10 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.cdt.core.CommandLauncher; import org.eclipse.cdt.core.CommandLauncher;
import org.eclipse.cdt.core.ICommandLauncher; import org.eclipse.cdt.core.ICommandLauncher;
@ -227,18 +228,18 @@ public class CommandBuilder implements IBuildModelBuilder {
return fErrMsg; return fErrMsg;
} }
private String[] mapToStringArray(Map map){ private String[] mapToStringArray(Map<String, String> map){
if(map == null) if(map == null)
return null; return null;
List list = new ArrayList(); List<String> list = new ArrayList<String>();
for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){ Set<Entry<String, String>> entrySet = map.entrySet();
Map.Entry entry = (Map.Entry)iter.next(); for (Entry<String, String> entry : entrySet) {
list.add((String)entry.getKey() + "=" + (String)entry.getValue()); //$NON-NLS-1$ list.add(entry.getKey() + '=' + entry.getValue());
} }
return (String[])list.toArray(new String[list.size()]); return list.toArray(new String[list.size()]);
} }
protected void printMessage(String msg, OutputStream os){ protected void printMessage(String msg, OutputStream os){
@ -272,19 +273,19 @@ public class CommandBuilder implements IBuildModelBuilder {
return buf.toString(); return buf.toString();
} }
private String getExecutable(String command, Map environment){ private String getExecutable(String command, Map<String, String> environment){
if(new Path(command).isAbsolute()) if(new Path(command).isAbsolute())
return command; return command;
return searchExecutable(command, getPaths(environment)); return searchExecutable(command, getPaths(environment));
} }
private String[] getPaths(Map env){ private String[] getPaths(Map<String, String> env){
String pathsStr = (String)env.get(PATH_ENV); String pathsStr = env.get(PATH_ENV);
if(pathsStr == null){ if(pathsStr == null){
for(Iterator iter = env.entrySet().iterator(); iter.hasNext();){ Set<Entry<String, String>> entrySet = env.entrySet();
Map.Entry entry = (Map.Entry)iter.next(); for (Entry<String, String> entry : entrySet) {
if(PATH_ENV.equalsIgnoreCase((String)entry.getKey())){ if(PATH_ENV.equalsIgnoreCase(entry.getKey())){
pathsStr = (String)entry.getValue(); pathsStr = entry.getValue();
break; break;
} }
} }