Skip to content

Commit be15ba4

Browse files
committed
Update avr-gcc to 4.9.2 and avrdude to 6.3
1 parent 6521a7a commit be15ba4

23 files changed

+35
-33
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ build/*.tar.bz2
1818
build/windows/work/
1919
build/windows/*.zip
2020
build/windows/*.tgz
21+
build/windows/*.tar.bz2
2122
build/windows/libastylej*
2223
build/windows/arduino-*.zip
2324
build/windows/dist/*.tar.gz

build/build.xml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191

9292
<property name="ARDUINO-BUILDER-VERSION" value="1.3.19" />
9393
<property name="LIBLISTSERIAL-VERSION" value="1.1.0" />
94+
<property name="AVRGCC-VERSION" value="4.9.2-arduino" />
95+
<property name="AVRDUDE-VERSION" value="6.3-arduino" />
9496

9597
<!-- Libraries required for running arduino -->
9698
<fileset dir=".." id="runtime.jars">
@@ -482,10 +484,10 @@
482484
<target name="macosx-build-avr-toolchain" unless="light_bundle">
483485
<antcall target="avr-toolchain-bundle">
484486
<param name="unpack_target" value="untar"/>
485-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
486-
<param name="gcc_version" value="4.8.1-arduino5"/>
487-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
488-
<param name="avrdude_version" value="6.0.1-arduino5"/>
487+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
488+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
489+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
490+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
489491
</antcall>
490492

491493
<chmod perm="+x">
@@ -712,10 +714,10 @@
712714

713715
<antcall target="avr-toolchain-bundle">
714716
<param name="unpack_target" value="untar"/>
715-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
716-
<param name="gcc_version" value="4.8.1-arduino5"/>
717-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
718-
<param name="avrdude_version" value="6.0.1-arduino5"/>
717+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
718+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
719+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
720+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
719721
</antcall>
720722

721723
<antcall target="package-library-index-json-bundle"/>
@@ -744,10 +746,10 @@
744746

745747
<antcall target="avr-toolchain-bundle">
746748
<param name="unpack_target" value="untar"/>
747-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
748-
<param name="gcc_version" value="4.8.1-arduino5"/>
749-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
750-
<param name="avrdude_version" value="6.0.1-arduino5"/>
749+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
750+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
751+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
752+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
751753
</antcall>
752754

753755
<antcall target="package-library-index-json-bundle"/>
@@ -776,10 +778,10 @@
776778

777779
<antcall target="avr-toolchain-bundle">
778780
<param name="unpack_target" value="untar"/>
779-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
780-
<param name="gcc_version" value="4.8.1-arduino5"/>
781-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
782-
<param name="avrdude_version" value="6.0.1-arduino5"/>
781+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
782+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
783+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
784+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
783785
</antcall>
784786

785787
<antcall target="package-library-index-json-bundle"/>
@@ -1063,11 +1065,11 @@
10631065

10641066
<target name="windows-build-avr-toolchain">
10651067
<antcall target="avr-toolchain-bundle">
1066-
<param name="unpack_target" value="unzip"/>
1067-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
1068-
<param name="gcc_version" value="4.8.1-arduino5"/>
1069-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
1070-
<param name="avrdude_version" value="6.0.1-arduino5"/>
1068+
<param name="unpack_target" value="untar"/>
1069+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.tar.bz2"/>
1070+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
1071+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.tar.bz2"/>
1072+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
10711073
</antcall>
10721074

10731075
<antcall target="package-library-index-json-bundle"/>
@@ -1156,7 +1158,7 @@
11561158
</antcall>
11571159

11581160
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1159-
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1161+
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11601162
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
11611163

11621164
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>

build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bf2f87bf19613b5bc89c599495acd3edbb7883d1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f6004cc4a2b36a1db65acf011d1d2c9e352859fd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8e197612de355492863e0c16e5f7eff613ece664

build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
709fe71fc92f1bf41b55f5f0e7fde11c4a0f2258
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cd3c6f573f015f3f907e0cf385bc688a7bca68fb
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5da144bfa6cdd723bcbb34b1d7cf54fc4ff85181

build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8c50de1eb21d9df37418ec6bd3aec691fc1d7bb0

build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
69313a235a017a58d547840f7bcb3a9d8f730427

build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c6c59c2846a84196cd18b58635916cd4fe73eb39

build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
290557c99c63a8c53dec67acc1719687f0f8c6a3

0 commit comments

Comments
 (0)