From bf8d82a992d82f3d60c65d88cee5bf07a60557e9 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Thu, 16 Jun 2016 19:44:25 -0400 Subject: [PATCH] Bug 487633 - Arduino support build.system.path for Due. Change-Id: I4ef4de8ed34c5fc412830ca9789bc5becb883911 --- .../eclipse/cdt/arduino/core/tests/FullIntegration.java | 5 ----- .../core/internal/build/ArduinoBuildConfiguration.java | 7 +++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java index 6545ea8f86e..41994a8e053 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java @@ -78,11 +78,6 @@ public class FullIntegration { boards.add(arduinoManager.getBoard("TeeOnArdu", "avr", "FloraTeensyCore")); boards.add(arduinoManager.getBoard("TeeOnArdu", "avr", "TeeOnArdu")); - // TODO build.system.path missing - boards.add(arduinoManager.getBoard("arduino", "sam", "arduino_due_x")); - boards.add(arduinoManager.getBoard("arduino", "sam", "arduino_due_x_dbg")); - boards.add(arduinoManager.getBoard("Intel", "arc32", "arduino_101")); - if (Platform.getOS().equals(Platform.OS_WIN32)) { // tool chain incorrect? boards.add(arduinoManager.getBoard("Intel", "i586", "izmir_fd")); diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java index 877be21da5c..9f302ea230c 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java @@ -217,11 +217,10 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration implements Te properties.put("runtime.ide.version", "10608"); //$NON-NLS-1$ //$NON-NLS-2$ properties.put("software", "ARDUINO"); //$NON-NLS-1$ //$NON-NLS-2$ properties.put("build.arch", platform.getArchitecture().toUpperCase()); //$NON-NLS-1$ - String configName = getBuildConfiguration().getName(); - if (configName.equals(IBuildConfiguration.DEFAULT_CONFIG_NAME)) { - configName = "default"; //$NON-NLS-1$ - } properties.put("build.path", "."); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("build.core.path", //$NON-NLS-1$ + platform.getInstallPath().resolve("core").resolve("{build.core}").toString()); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("build.system.path", platform.getInstallPath().resolve("system").toString()); //$NON-NLS-1$ //$NON-NLS-2$ properties.put("build.variant.path", //$NON-NLS-1$ platform.getInstallPath().resolve("variants").resolve("{build.variant}").toString()); //$NON-NLS-1$ //$NON-NLS-2$