From 8bab7cead6e30bebd96e8416839b95a5c6cf7fd0 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 20 Sep 2017 17:54:47 +0200
Subject: [PATCH] Download the bundled core as any other tool

---
 build/avr-1.6.20.tar.bz2.sha |  1 +
 build/build.xml              | 30 +++++++++++-------------------
 2 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100644 build/avr-1.6.20.tar.bz2.sha

diff --git a/build/avr-1.6.20.tar.bz2.sha b/build/avr-1.6.20.tar.bz2.sha
new file mode 100644
index 000000000..3ffcd339f
--- /dev/null
+++ b/build/avr-1.6.20.tar.bz2.sha
@@ -0,0 +1 @@
+9b858371109590c2392cbf1c38936623e737848b
diff --git a/build/build.xml b/build/build.xml
index b5e2f0bb3..19d1c8ad1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,6 +91,7 @@
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
   <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.4-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino9" />
+  <property name="AVRCORE-VERSION" value="1.6.20" />
   <property name="arduinoOTA-VERSION" value="1.2.1" />
 
   <!-- Libraries required for running arduino -->
@@ -263,11 +264,13 @@
 
   <!-- copy hardware folder -->
   <target name="assemble-hardware" unless="light_bundle">
-    <copy todir="${target.path}/hardware">
-      <fileset dir="../hardware">
-        <exclude name="arduino/sam/**"/>
-      </fileset>
-    </copy>
+    <mkdir dir="${target.path}/hardware/arduino" />
+    <antcall target="untar">
+      <param name="archive_file" value="avr-${AVRCORE-VERSION}.tar.bz2"/>
+      <param name="archive_url" value="https://downloads.arduino.cc/cores/avr-${AVRCORE-VERSION}.tar.bz2"/>
+      <param name="final_folder" value="${target.path}/hardware/arduino/avr"/>
+      <param name="dest_folder" value="${target.path}/hardware/arduino"/>
+    </antcall>
   </target>
 
   <!-- - - - - - - - - -->
@@ -275,17 +278,6 @@
   <!-- - - - - - - - - -->
   <target name="revision-check">
 
-    <!-- figure out the AVR core version number in platform.txt -->
-    <loadfile srcfile="../hardware/arduino/avr/platform.txt" property="revision.avr.platform">
-      <filterchain>
-        <tokenfilter>
-          <linetokenizer />
-          <containsregex pattern="version="/>
-          <replaceregex pattern="version=(.*)" flags="g" replace="\1"/>
-        </tokenfilter>
-      </filterchain>
-    </loadfile>
-
     <!-- figure out the latest AVR core version number in package_index.json -->
     <loadfile srcfile="../hardware/package_index_bundled.json" property="revision.avr.index">
       <filterchain>
@@ -298,18 +290,18 @@
       </filterchain>
     </loadfile>
 
-    <echo message="AVR Arduino core version in platform.txt is: ${revision.avr.platform}" />
+    <echo message="AVR Arduino core version in build.xml is: ${AVRCORE-VERSION}" />
     <echo message="    latest in package_index_bundled.json is: ${revision.avr.index}" />
     <condition property="revision.avr.ok">
       <or>
         <!-- fail build if -Drevision.check=enforce is set -->
         <not><equals arg1="${revision.check}" arg2="enforce"/></not>
-        <equals arg1="${revision.avr.index}" arg2="${revision.avr.platform}"/>
+        <equals arg1="${revision.avr.index}" arg2="${AVRCORE-VERSION}"/>
       </or>
     </condition>
     <fail unless="revision.avr.ok">
       Mismatching versions for bundled AVR core and package_index_bundled.json.
-      Please check your platform.txt and package_index_bundled.json.
+      Please check your package_index_bundled.json.
     </fail>
 
     <!-- figure out the IDE version number -->