Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for 1.6.12 release (Sierra related fixes) #5374

Merged
merged 2 commits into from
Sep 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build/arduino-builder-macosx-1.3.21.tar.bz2.sha

This file was deleted.

1 change: 1 addition & 0 deletions build/arduino-builder-macosx-1.3.21_r1.tar.bz2.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c5ccdd0ffba382f8252d70a049fc9377592fee84
42 changes: 13 additions & 29 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@

<property name="portable" value="false" />

<property name="ARDUINO-BUILDER-VERSION" value="1.3.21" />
<property name="ARDUINO-BUILDER-VERSION" value="1.3.21_r1" />
<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-arduino6" />

<!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars">
Expand Down Expand Up @@ -491,19 +492,14 @@
<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-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
</antcall>

<chmod perm="+x">
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
</chmod>

<!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
<chmod perm="-x">
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
</chmod>
</target>

<target name="macosx-run" depends="build,start"/>
Expand Down Expand Up @@ -721,8 +717,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-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
</antcall>
</target>

Expand Down Expand Up @@ -751,8 +747,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-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
</antcall>
</target>

Expand Down Expand Up @@ -781,8 +777,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-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
</antcall>
</target>

Expand Down Expand Up @@ -1067,8 +1063,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-6.0.1-arduino5-i686-mingw32.zip"/>
<param name="avrdude_version" value="6.0.1-arduino5"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
</antcall>
</target>

Expand Down Expand Up @@ -1155,26 +1151,14 @@
</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-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>

<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}"/>

<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>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9788fdd59bcc5b6267eb12b5be6667476e5cc8d9
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dec8e05d06c945746169c318922d68dee36c178f
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9e747ae659b320777882678272c39ed3f8ef7705

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a29947719bb971af22feb430e5070e67c62b265b
1 change: 0 additions & 1 deletion build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e14651bfc29065ce0c6a1bacb3cfeac53705430a
2 changes: 1 addition & 1 deletion hardware/arduino/avr/platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification

name=Arduino AVR Boards
version=1.6.13
version=1.6.14

# AVR compile variables
# ---------------------
Expand Down
42 changes: 21 additions & 21 deletions hardware/package_index_bundled.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
{
"name": "Arduino AVR Boards",
"architecture": "avr",
"version": "1.6.13",
"version": "1.6.14",
"category": "Arduino",
"help": {
"online": "http://www.arduino.cc/en/Reference/HomePage"
},
"url": "http://downloads.arduino.cc/cores/avr-1.6.13.tar.bz2",
"archiveFileName": "avr-1.6.13.tar.bz2",
"checksum": "SHA-256:617f458dd3507072b9a6f9fdc78888c66aa420a2fb081c4c1556598a2d69d643",
"size": "4993644",
"archiveFileName": "avr-1.6.14.tar.bz2",
"checksum": "SHA-256:a5f7d66c83e3d4722f4c8dab42bdbcf5af98c611ffca1802ef3d1957b894bd92",
"size": "4993455",
"boards": [
{"name": "Arduino Yún"},
{"name": "Arduino/Genuino Uno"},
Expand Down Expand Up @@ -52,49 +52,49 @@
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
"version": "6.3.0-arduino6"
}
]
}
],
"tools": [
{
"name": "avrdude",
"version": "6.0.1-arduino5",
"version": "6.3.0-arduino6",
"systems": [
{
"size": "267095",
"checksum": "SHA-256:23ea1341dbc117ec067f2eb1a498ad2bdd7d11fff0143c00b2e018c39804f6b4",
"size": "644600",
"checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7",
"host": "arm-linux-gnueabihf",
"archiveFileName": "avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2",
"archiveFileName": "avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2",
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"
},
{
"size": "264894",
"checksum": "SHA-256:41af8d3b0a586853c8317b4fb5163ca0db594a1870ddf680fd988c42166fc3e5",
"size": "696273",
"checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084",
"host": "i386-apple-darwin11",
"archiveFileName": "avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2",
"archiveFileName": "avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2",
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"
},
{
"size": "292629",
"checksum": "SHA-256:d826cca7383461f7e8adde686372cf900e9cb3afd639555cf2d6c645b283a476",
"size": "746653",
"checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
"host": "x86_64-linux-gnu",
"archiveFileName": "avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2",
"archiveFileName": "avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2",
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"
},
{
"size": "283121",
"checksum": "SHA-256:5933d66927bce46ababa9b68a8b7f1d53f68c4f3ff7a5ce4b85d7cf4e6c6bfee",
"size": "733127",
"checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb",
"host": "i686-linux-gnu",
"archiveFileName": "avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2",
"archiveFileName": "avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2",
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"
},
{
"size": "241634",
"checksum": "SHA-256:41f667f1f6a0ab8df46b4ffacd023176dcdef331d6db3b74bddd37d18cca0a44",
"size": "645859",
"checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",
"host": "i686-mingw32",
"archiveFileName": "avrdude-6.0.1-arduino5-i686-mingw32.zip",
"archiveFileName": "avrdude-6.3.0-arduino6-i686-mingw32.zip",
"url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-mingw32.zip"
}
]
Expand Down