Skip to content

Commit 05b6477

Browse files
cmagliecmaglie
committed
Update avr-gcc to 4.9.2 and avrdude to 6.3
1 parent b44c325 commit 05b6477

23 files changed

+35
-33
lines changed

‎.gitignore

+1
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

+24-22
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.3" />
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">
@@ -490,10 +492,10 @@
490492
<target name="macosx-build-avr-toolchain" unless="light_bundle">
491493
<antcall target="avr-toolchain-bundle">
492494
<param name="unpack_target" value="untar"/>
493-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
494-
<param name="gcc_version" value="4.8.1-arduino5"/>
495-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
496-
<param name="avrdude_version" value="6.0.1-arduino5"/>
495+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
496+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
497+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
498+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
497499
</antcall>
498500

499501
<chmod perm="+x">
@@ -720,10 +722,10 @@
720722

721723
<antcall target="avr-toolchain-bundle">
722724
<param name="unpack_target" value="untar"/>
723-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
724-
<param name="gcc_version" value="4.8.1-arduino5"/>
725-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
726-
<param name="avrdude_version" value="6.0.1-arduino5"/>
725+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
726+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
727+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
728+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
727729
</antcall>
728730

729731
<antcall target="package-library-index-json-bundle"/>
@@ -752,10 +754,10 @@
752754

753755
<antcall target="avr-toolchain-bundle">
754756
<param name="unpack_target" value="untar"/>
755-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
756-
<param name="gcc_version" value="4.8.1-arduino5"/>
757-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
758-
<param name="avrdude_version" value="6.0.1-arduino5"/>
757+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
758+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
759+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
760+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
759761
</antcall>
760762

761763
<antcall target="package-library-index-json-bundle"/>
@@ -784,10 +786,10 @@
784786

785787
<antcall target="avr-toolchain-bundle">
786788
<param name="unpack_target" value="untar"/>
787-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
788-
<param name="gcc_version" value="4.8.1-arduino5"/>
789-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
790-
<param name="avrdude_version" value="6.0.1-arduino5"/>
789+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
790+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
791+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
792+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
791793
</antcall>
792794

793795
<antcall target="package-library-index-json-bundle"/>
@@ -1071,11 +1073,11 @@
10711073

10721074
<target name="windows-build-avr-toolchain">
10731075
<antcall target="avr-toolchain-bundle">
1074-
<param name="unpack_target" value="unzip"/>
1075-
<param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
1076-
<param name="gcc_version" value="4.8.1-arduino5"/>
1077-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
1078-
<param name="avrdude_version" value="6.0.1-arduino5"/>
1076+
<param name="unpack_target" value="untar"/>
1077+
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.tar.bz2"/>
1078+
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
1079+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.tar.bz2"/>
1080+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
10791081
</antcall>
10801082

10811083
<antcall target="package-library-index-json-bundle"/>
@@ -1164,7 +1166,7 @@
11641166
</antcall>
11651167

11661168
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1167-
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1169+
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11681170
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
11691171

11701172
<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

-1
This file was deleted.

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

-1
This file was deleted.

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

-1
This file was deleted.

‎build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bf2f87bf19613b5bc89c599495acd3edbb7883d1

‎build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f6004cc4a2b36a1db65acf011d1d2c9e352859fd

‎build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha

+1
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

-1
This file was deleted.

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

-1
This file was deleted.

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

-1
This file was deleted.

‎build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
709fe71fc92f1bf41b55f5f0e7fde11c4a0f2258

‎build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cd3c6f573f015f3f907e0cf385bc688a7bca68fb

‎build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha

+1
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

-1
This file was deleted.

‎build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha

+1
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

-1
This file was deleted.

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

-1
This file was deleted.

‎build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha

+1
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

-1
This file was deleted.

‎build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c6c59c2846a84196cd18b58635916cd4fe73eb39

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

-1
This file was deleted.

‎build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
290557c99c63a8c53dec67acc1719687f0f8c6a3

0 commit comments

Comments
 (0)