Update to avrdude 6.3

use package_index_bundle overlay but don't update avr core yet

Author: facchinm

build/build.xml

@@ -88,6 +88,7 @@
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.21" />
   <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">
@@ -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"/>
@@ -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>
 
@@ -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>
 
@@ -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>
 
@@ -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>
 
@@ -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>

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

@@ -0,0 +1 @@
+9788fdd59bcc5b6267eb12b5be6667476e5cc8d9

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

@@ -0,0 +1 @@
+dec8e05d06c945746169c318922d68dee36c178f

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

@@ -0,0 +1 @@
+9e747ae659b320777882678272c39ed3f8ef7705

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

@@ -0,0 +1 @@
+a29947719bb971af22feb430e5070e67c62b265b