Skip to content

Commit 382ff09

Browse files
committed
DO NOT MERGE: Allow the IDE to select the correct tools
This hack is needed because the AVR core tools are bundled inside the IDE. This commit must be removed when the new tools are correctly inserted in the package_index.json.
1 parent 69da8f7 commit 382ff09

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

build/build.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,8 +1161,14 @@
11611161
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11621162
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
11631163

1164+
<!-- XXX: This is a temporary hack to let the IDE select the correct bundled tools. -->
1165+
<!-- XXX: THE FOLLOWING LINES MUST BE REMOVED BEFORE MERGING! -->
1166+
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=6.0.1-arduino5${line.separator}"/>
1167+
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=4.8.1-arduino5${line.separator}"/>
1168+
<!-- XXX: THE FOLLOWING LINES MUST BE RESTORED BEFORE MERGING!
11641169
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
11651170
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
1171+
-->
11661172
</target>
11671173

11681174
<target name="package-library-index-json-bundle">

0 commit comments

Comments
 (0)