Skip to content

Commit 35743b1

Browse files
facchinmfacchinm
committed
Update to avrdude 6.3 and avr core 1.6.14
1 parent e1c2d0d commit 35743b1

14 files changed

+39
-56
lines changed

‎build/build.xml

+12-28
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<property name="ARDUINO-BUILDER-VERSION" value="1.3.21" />
8989
<property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
9090
<property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
91+
<property name="AVRDUDE-VERSION" value="6.3.0-arduino6" />
9192

9293
<!-- Libraries required for running arduino -->
9394
<fileset dir=".." id="runtime.jars">
@@ -491,19 +492,14 @@
491492
<param name="unpack_target" value="untar"/>
492493
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
493494
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
494-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
495-
<param name="avrdude_version" value="6.0.1-arduino5"/>
495+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
496+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
496497
</antcall>
497498

498499
<chmod perm="+x">
499500
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
500501
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
501502
</chmod>
502-
503-
<!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
504-
<chmod perm="-x">
505-
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
506-
</chmod>
507503
</target>
508504

509505
<target name="macosx-run" depends="build,start"/>
@@ -721,8 +717,8 @@
721717
<param name="unpack_target" value="untar"/>
722718
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
723719
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
724-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
725-
<param name="avrdude_version" value="6.0.1-arduino5"/>
720+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
721+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
726722
</antcall>
727723
</target>
728724

@@ -751,8 +747,8 @@
751747
<param name="unpack_target" value="untar"/>
752748
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
753749
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
754-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
755-
<param name="avrdude_version" value="6.0.1-arduino5"/>
750+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
751+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
756752
</antcall>
757753
</target>
758754

@@ -781,8 +777,8 @@
781777
<param name="unpack_target" value="untar"/>
782778
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
783779
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
784-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
785-
<param name="avrdude_version" value="6.0.1-arduino5"/>
780+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
781+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
786782
</antcall>
787783
</target>
788784

@@ -1067,8 +1063,8 @@
10671063
<param name="unpack_target" value="unzip"/>
10681064
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
10691065
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
1070-
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
1071-
<param name="avrdude_version" value="6.0.1-arduino5"/>
1066+
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
1067+
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
10721068
</antcall>
10731069
</target>
10741070

@@ -1155,26 +1151,14 @@
11551151
</antcall>
11561152

11571153
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1158-
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1159-
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
1154+
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11601155

11611156
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
11621157
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
11631158

11641159
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
11651160
</target>
11661161

1167-
<target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
1168-
<exec executable="mv" failonerror="true">
1169-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
1170-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
1171-
</exec>
1172-
<exec executable="mv" failonerror="true">
1173-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
1174-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
1175-
</exec>
1176-
</target>
1177-
11781162
<target name="generate-hourly-build-txt" if="hourly">
11791163
<echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
11801164
</target>

‎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.0-arduino6-armhf-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9788fdd59bcc5b6267eb12b5be6667476e5cc8d9

‎build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2.sha

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

‎build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9e747ae659b320777882678272c39ed3f8ef7705

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

-1
This file was deleted.

‎build/macosx/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2.sha

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

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

-1
This file was deleted.

‎build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha

-1
This file was deleted.

‎build/windows/avrdude-6.3.0-arduino6-i686-w64-mingw32.zip.sha

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

‎hardware/arduino/avr/platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
77

88
name=Arduino AVR Boards
9-
version=1.6.13
9+
version=1.6.14
1010

1111
# AVR compile variables
1212
# ---------------------

‎hardware/package_index_bundled.json

+21-21
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
{
1313
"name": "Arduino AVR Boards",
1414
"architecture": "avr",
15-
"version": "1.6.13",
15+
"version": "1.6.14",
1616
"category": "Arduino",
1717
"help": {
1818
"online": "http://www.arduino.cc/en/Reference/HomePage"
1919
},
2020
"url": "http://downloads.arduino.cc/cores/avr-1.6.13.tar.bz2",
21-
"archiveFileName": "avr-1.6.13.tar.bz2",
22-
"checksum": "SHA-256:617f458dd3507072b9a6f9fdc78888c66aa420a2fb081c4c1556598a2d69d643",
23-
"size": "4993644",
21+
"archiveFileName": "avr-1.6.14.tar.bz2",
22+
"checksum": "SHA-256:a5f7d66c83e3d4722f4c8dab42bdbcf5af98c611ffca1802ef3d1957b894bd92",
23+
"size": "4993455",
2424
"boards": [
2525
{"name": "Arduino Yún"},
2626
{"name": "Arduino/Genuino Uno"},
@@ -52,49 +52,49 @@
5252
{
5353
"packager": "arduino",
5454
"name": "avrdude",
55-
"version": "6.0.1-arduino5"
55+
"version": "6.3.0-arduino6"
5656
}
5757
]
5858
}
5959
],
6060
"tools": [
6161
{
6262
"name": "avrdude",
63-
"version": "6.0.1-arduino5",
63+
"version": "6.3.0-arduino6",
6464
"systems": [
6565
{
66-
"size": "267095",
67-
"checksum": "SHA-256:23ea1341dbc117ec067f2eb1a498ad2bdd7d11fff0143c00b2e018c39804f6b4",
66+
"size": "644600",
67+
"checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7",
6868
"host": "arm-linux-gnueabihf",
69-
"archiveFileName": "avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2",
69+
"archiveFileName": "avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2",
7070
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"
7171
},
7272
{
73-
"size": "264894",
74-
"checksum": "SHA-256:41af8d3b0a586853c8317b4fb5163ca0db594a1870ddf680fd988c42166fc3e5",
73+
"size": "696273",
74+
"checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084",
7575
"host": "i386-apple-darwin11",
76-
"archiveFileName": "avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2",
76+
"archiveFileName": "avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2",
7777
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"
7878
},
7979
{
80-
"size": "292629",
81-
"checksum": "SHA-256:d826cca7383461f7e8adde686372cf900e9cb3afd639555cf2d6c645b283a476",
80+
"size": "746653",
81+
"checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
8282
"host": "x86_64-linux-gnu",
83-
"archiveFileName": "avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2",
83+
"archiveFileName": "avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2",
8484
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"
8585
},
8686
{
87-
"size": "283121",
88-
"checksum": "SHA-256:5933d66927bce46ababa9b68a8b7f1d53f68c4f3ff7a5ce4b85d7cf4e6c6bfee",
87+
"size": "733127",
88+
"checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb",
8989
"host": "i686-linux-gnu",
90-
"archiveFileName": "avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2",
90+
"archiveFileName": "avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2",
9191
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"
9292
},
9393
{
94-
"size": "241634",
95-
"checksum": "SHA-256:41f667f1f6a0ab8df46b4ffacd023176dcdef331d6db3b74bddd37d18cca0a44",
94+
"size": "645859",
95+
"checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",
9696
"host": "i686-mingw32",
97-
"archiveFileName": "avrdude-6.0.1-arduino5-i686-mingw32.zip",
97+
"archiveFileName": "avrdude-6.3.0-arduino6-i686-mingw32.zip",
9898
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-mingw32.zip"
9999
}
100100
]

0 commit comments

Comments
 (0)