Bug 481469 - Support new archive_file_path var in Arduino 1.6.9.

Change-Id: I1aa9473ad50418d908993c7b39929e5d73b34685

diff --git a/releng/org.eclipse.cdt.target/cdt-e4.5.target b/releng/org.eclipse.cdt.target/cdt-e4.5.target
index 3c17558..c97a944 100644 (file)
--- a/releng/org.eclipse.cdt.target/cdt-e4.5.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.5.target
@@ -41,7 +41,7 @@
 </location>\r
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">\r
 <unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>\r
-<repository location="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>\r
+<repository location="https://hudson.eclipse.org/cdt/job/launchbar-mars/lastSuccessfulBuild/artifact/repo/target/repository/"/>\r
 </location>\r
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">\r
 <unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>\r

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 c8779d4..4c5aa15 100644 (file)
--- 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
@@ -391,6 +391,7 @@ public class ArduinoBuildConfiguration {
                properties.put("object_file", "$@"); //$NON-NLS-1$ //$NON-NLS-2$
                properties.put("source_file", "$<"); //$NON-NLS-1$ //$NON-NLS-2$
                properties.put("archive_file", "core.a"); //$NON-NLS-1$ //$NON-NLS-2$
+               properties.put("archive_file_path", "{build.path}/{archive_file}"); //$NON-NLS-1$ //$NON-NLS-2$
                properties.put("object_files", "$(PROJECT_OBJS) $(LIBRARIES_OBJS)"); //$NON-NLS-1$ //$NON-NLS-2$
 
                buildModel.put("recipe_cpp_o_pattern", resolveProperty("recipe.cpp.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$