rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Revert to avrdude 6.0.1

Browse Source 
This reverts commits:
385edd26fc2b64a442130f2f6a63e22416621857 (Removed "macosx-fix-bundled-toolchain-missing-symlinks" build task)
f5fd6423c3df9423bf285306b761f3a54d918dcf (Updated avrdude to 6.3-arduino2)
5a01929b8fdc10dfca974d83bb8065696384f1ec (avrdude 6.3: fixed IDE build for macosx)

And part of this commit:
05b647721cec48f1b6663688b61f4408539795a1 (Update avr-gcc to 4.9.2 and avrdude to 6.3)
This commit is contained in:
Cristian Maglie 2016-08-05 17:05:44 +02:00
parent 629b662de3
commit 9669d67e16
11 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build/build.xml
View File

@ -92,7 +92,6 @@
<property name="ARDUINO-BUILDER-VERSION" value="1.3.20" />
<property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
<property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
<property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
<!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars">
@ -494,8 +493,8 @@
<param name="unpack_target" value="untar"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
</antcall>
<chmod perm="+x">
@ -719,8 +718,8 @@
<param name="unpack_target" value="untar"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
</antcall>
<antcall target="package-library-index-json-bundle"/>
@ -751,8 +750,8 @@
<param name="unpack_target" value="untar"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
</antcall>
<antcall target="package-library-index-json-bundle"/>
@ -783,8 +782,8 @@
<param name="unpack_target" value="untar"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
</antcall>
<antcall target="package-library-index-json-bundle"/>
@ -1071,8 +1070,8 @@
<param name="unpack_target" value="unzip"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
</antcall>
<antcall target="package-library-index-json-bundle"/>
@ -1161,7 +1160,8 @@
</antcall>
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
<echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
@ -1191,6 +1191,17 @@
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
</target>
<target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
<exec executable="mv" failonerror="true">
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
</exec>
<exec executable="mv" failonerror="true">
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
</exec>
</target>
<target name="generate-hourly-build-txt" if="hourly">
<echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
</target>

1
build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
b5968416647e79f5c395bf2a9ba000127dacc9da

1
build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
cf859c679713cae2f1b9089d797d211dd84fe658

1
build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
cfc52036f532c3a7050f6d4ec7645d060800aa39

1
build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
View File

@ -1 +0,0 @@
a074c17e2013942e3e081fe03875c9d5701a0922

1
build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
View File

@ -1 +0,0 @@
e9ce49f5e5c7d0d2eabd9405ca6160b70cd52645

1
build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
View File

@ -1 +0,0 @@
3ba4c2660f8a8c40ba3902ab8a158aa3e1b91764

1
build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha Normal file
View File

@ -0,0 +1 @@
52afce6cbe1cc1021bca1234cf25b298350f97dd

1
build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
View File

@ -1 +0,0 @@
39a1940fbb4a25af5316d9a6bde99b6a29585e37

2
build/shared/revisions.txt
View File

@ -4,6 +4,8 @@ ARDUINO 1.6.11
* Fixed a serious bug that prevented some 3rd party boards, installed through external index.json URL, to work correctly.
* builder: fixed regression about inclusion of files in subfolders of the sketch
(see https://github.com/arduino/Arduino/issues/5186 for details)
* avrdude: reverted to version 6.0.1, until all discovered regressions are solved
(see https://github.com/arduino/Arduino/issues?q=is%3Aissue+is%3Aopen+label%3A%22Component%3A+Avrdude+6.3%22 for details)
ARDUINO 1.6.10 - 2016.07.26

1
build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha Normal file
View File

@ -0,0 +1 @@
bad246afeb0b9bcbe623a29cb204127f901102cf