mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-16 13:35:22 +02:00
Code Issues Wiki Activity

Try Arduino without adding things to the enviornment.

Browse source 
Full paths to tools seems to be the norm for the arduino platform
definitions. We're having trouble on Windows finding make so let's
try without then env and put the full path to make as well.

Change-Id: I0143c7b36d93a035ec07ded5b55859bcef7ce0d0
This commit is contained in:
Doug Schaefer 2015-09-11 12:01:00 -04:00
parent 97f85e0f6b
commit 586937fc05
1 changed files with 10 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
View file

@ -26,7 +26,6 @@ import org.eclipse.cdt.arduino.core.internal.board.ArduinoLibrary;
import org.eclipse.cdt.arduino.core.internal.board.ArduinoManager;
import org.eclipse.cdt.arduino.core.internal.board.ArduinoPackage;
import org.eclipse.cdt.arduino.core.internal.board.ArduinoPlatform;
import org.eclipse.cdt.arduino.core.internal.board.ArduinoTool;
import org.eclipse.cdt.arduino.core.internal.board.ToolDependency;
import org.eclipse.cdt.arduino.core.internal.console.ArduinoConsoleParser;
import org.eclipse.cdt.arduino.core.internal.console.ArduinoErrorParser;
@ -150,7 +149,8 @@ public class ArduinoBuildConfiguration {
projectDesc.setActiveBuildConfig(config.getName());
project.setDescription(projectDesc, monitor);
// Reindex - assuming for now each config has different compiler settings
// Reindex - assuming for now each config has different compiler
// settings
CCorePlugin.getIndexManager().reindex(CoreModel.getDefault().create(project));
}
@ -425,63 +425,26 @@ public class ArduinoBuildConfiguration {
}
public void setEnvironment(Map<String, String> env) throws CoreException {
// Arduino home to find platforms and libraries
env.put("ARDUINO_HOME", pathString(ArduinoPreferences.getArduinoHome())); //$NON-NLS-1$
// Everything is specified with full path, do not need to add anything
// to the environment.
}
// Add tools to the path
String pathKey = null;
String path = null;
for (Map.Entry<String, String> entry : env.entrySet()) {
if (entry.getKey().equalsIgnoreCase("PATH")) { //$NON-NLS-1$
pathKey = entry.getKey();
path = entry.getValue();
break;
}
}
List<Path> toolPaths = new ArrayList<>();
if (isWindows) {
// Add in the tools/make directory to pick up make
toolPaths.add(ArduinoPreferences.getArduinoHome().resolve("tools/make")); //$NON-NLS-1$
}
ArduinoBoard board = getBoard();
ArduinoPlatform platform = board.getPlatform();
for (ToolDependency dep : platform.getToolsDependencies()) {
ArduinoTool tool = dep.getTool();
Path installPath = tool.getInstallPath();
Path binPath = installPath.resolve("bin"); //$NON-NLS-1$
if (binPath.toFile().exists()) {
toolPaths.add(binPath);
} else {
// use the install dir by default
toolPaths.add(installPath);
}
}
for (Path toolPath : toolPaths) {
if (path != null) {
path = pathString(toolPath) + File.pathSeparatorChar + path;
} else {
path = pathString(toolPath);
}
}
if (pathKey == null) {
pathKey = "PATH"; //$NON-NLS-1$
}
env.put(pathKey, path);
public String getMakeCommand() {
return isWindows ? ArduinoPreferences.getArduinoHome().resolve("tools/make/make").toString() : "make"; //$NON-NLS-1$ //$NON-NLS-2$
}
public String[] getBuildCommand() throws CoreException {
return new String[] { "make", "-f", getMakeFile().getName() }; //$NON-NLS-1$ //$NON-NLS-2$
return new String[] { getMakeCommand(), "-f", getMakeFile().getName() }; //$NON-NLS-1$
}
public String[] getCleanCommand() throws CoreException {
return new String[] { "make", "-f", getMakeFile().getName(), "clean" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
return new String[] { getMakeCommand(), "-f", getMakeFile().getName(), "clean" }; //$NON-NLS-1$ //$NON-NLS-2$
}
public String[] getSizeCommand() throws CoreException {
// TODO this shouldn't be in the makefile
// should be like the upload command
return new String[] { "make", "-f", getMakeFile().getName(), "size" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
return new String[] { getMakeCommand(), "-f", getMakeFile().getName(), "size" }; //$NON-NLS-1$ //$NON-NLS-2$
}
public String getCodeSizeRegex() throws CoreException {
@ -504,7 +467,6 @@ public class ArduinoBuildConfiguration {
public String[] getUploadCommand(String serialPort) throws CoreException {
String toolName = getProperties().getProperty("upload.tool"); //$NON-NLS-1$
ArduinoTool tool = board.getPlatform().getTool(toolName);
Properties properties = getProperties();