From 6f1bfe1057d80146f423ff357a1f9e5c42613f6e Mon Sep 17 00:00:00 2001
From: CRImier <crimier@yandex.ru>
Date: Sat, 13 Jun 2015 21:19:17 +0000
Subject: [PATCH 1/6] Added ARM architecture to build.xml (WIP)

---
 build/build.xml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index f94e7975ca0..f859c4e734e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -19,6 +19,7 @@
   <condition property="platform" value="windows"><os family="windows" /></condition>
   <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
   <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
+  <condition property="platform" value="arm"><os family="unix" arch="arm" /></condition>
 
   <condition property="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
@@ -27,22 +28,28 @@
   <condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
 
   <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
   <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition>
 
   <condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
   <condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="arm" /></condition>
 
   <condition property="arch-bits" value="32">
     <equals arg1="${platform}" arg2="linux32"/>
   </condition>
+  <condition property="arch-bits" value="32">
+    <equals arg1="${platform}" arg2="arm"/>
+  </condition>
   <condition property="arch-bits" value="64">
     <equals arg1="${platform}" arg2="linux64"/>
   </condition>
@@ -389,7 +396,6 @@
     <antcall target="assemble">
       <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
     </antcall>
-
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
@@ -641,6 +647,7 @@
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
+    <!--
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
@@ -648,9 +655,27 @@
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
     <copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
+    -->
+    <copy file="/usr/lib/jni/libastylej.so" tofile="linux/work/lib/libastylej.so" />
     <chmod perm="755" file="linux/work/lib/libastylej.so" />
   </target>
 
+  <target name="arm-build" depends="linux-build" description="Build linux (32-bit) version">
+    <antcall target="linux-jvm-${linux-bundle-jvm-task}">
+      <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
+    </antcall>
+
+    <antcall target="avr-toolchain-bundle">
+      <param name="unpack_target" value="untar"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <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"/>
+  </target>
+
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
@@ -699,6 +724,10 @@
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
+  <target name="arm-run" depends="build" description="Run Linux ARM (32-bit) version">
+    <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
+  </target>
+
   <target name="linux64-run" depends="build" description="Run Linux (64-bit) version">
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>

From 9c4e1108f92accf20635df16009eed28bd1fd6c9 Mon Sep 17 00:00:00 2001
From: CRImier <crimier@yandex.ru>
Date: Thu, 18 Jun 2015 18:40:44 +0000
Subject: [PATCH 2/6] Modified build.xml to work with ARM arch and download
 corresponding files from arduino.cc website

---
 build/build.xml | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index f94e7975ca0..d78fbee7fcd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -19,6 +19,7 @@
   <condition property="platform" value="windows"><os family="windows" /></condition>
   <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
   <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
+  <condition property="platform" value="arm"><os family="unix" arch="arm" /></condition>
 
   <condition property="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
@@ -27,22 +28,28 @@
   <condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="linux"><equals arg1="${platform}" arg2="arm" /></condition>
 
   <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
   <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="arm" /></condition>
 
   <condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
   <condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
+  <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="arm" /></condition>
 
   <condition property="arch-bits" value="32">
     <equals arg1="${platform}" arg2="linux32"/>
   </condition>
+  <condition property="arch-bits" value="32">
+    <equals arg1="${platform}" arg2="arm"/>
+  </condition>
   <condition property="arch-bits" value="64">
     <equals arg1="${platform}" arg2="linux64"/>
   </condition>
@@ -389,7 +396,6 @@
     <antcall target="assemble">
       <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
     </antcall>
-
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
@@ -640,7 +646,9 @@
 
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
+  </target>
 
+  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
@@ -651,7 +659,34 @@
     <chmod perm="755" file="linux/work/lib/libastylej.so" />
   </target>
 
-  <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
+  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
+    <antcall target="unzip">
+      <param name="archive_file" value="./libastylej-arm-2.05.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-arm-2.05.zip" />
+      <param name="final_folder" value="${staging_folder}/libastylej" />
+      <param name="dest_folder" value="${staging_folder}" />
+    </antcall>
+    <copy file="linux/libastylej/libastylej.so" tofile="linux/work/lib/libastylej.so" />
+    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+  </target>
+
+  <target name="arm-build" depends="linux-build linux-libastyle-arm" description="Build linux (32-bit) version">
+    <antcall target="linux-jvm-${linux-bundle-jvm-task}">
+      <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
+    </antcall>
+
+    <antcall target="avr-toolchain-bundle">
+      <param name="unpack_target" value="untar"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="6.0.1-arduino5"/>
+    </antcall>
+
+    <antcall target="package-library-index-json-bundle"/>
+  </target>
+
+  <target name="linux32-build" depends="linux-build linux-libastyle-x86" description="Build linux (32-bit) version">
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
     </antcall>
@@ -667,7 +702,7 @@
     <antcall target="package-library-index-json-bundle"/>
   </target>
 
-  <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
+  <target name="linux64-build" depends="linux-build linux-libastyle-x86" description="Build linux (64-bit) version">
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
     </antcall>
@@ -699,6 +734,10 @@
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
+  <target name="arm-run" depends="build" description="Run Linux ARM version">
+    <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
+  </target>
+
   <target name="linux64-run" depends="build" description="Run Linux (64-bit) version">
     <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>

From ec6dceed7db1e0d01cda5b3437d97f8e26e8dd94 Mon Sep 17 00:00:00 2001
From: CRImier <crimier@yandex.ru>
Date: Fri, 19 Jun 2015 04:49:49 +0000
Subject: [PATCH 3/6] Fixed libastylej.so naming

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index b134c04e580..02df39eb781 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -666,7 +666,7 @@
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
-    <copy file="linux/libastylej/libastylej.so" tofile="linux/work/lib/libastylej.so" />
+    <copy file="linux/libastylej/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
     <chmod perm="755" file="linux/work/lib/libastylej.so" />
   </target>
 

From a85530756b035fd5ed282a0129076bf644bbfeab Mon Sep 17 00:00:00 2001
From: CRImier <crimier@yandex.ru>
Date: Fri, 19 Jun 2015 05:10:31 +0000
Subject: [PATCH 4/6] ...And another quick fix to libastylej naming

---
 build/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 02df39eb781..89e02f0b039 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -661,8 +661,8 @@
 
   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-arm-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-arm-2.05.zip" />
+      <param name="archive_file" value="./libastylej-2.05.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>

From 55e5c8b7427efc903daf83ca9cf3778ddee55e0b Mon Sep 17 00:00:00 2001
From: CRImier <crimier@yandex.ru>
Date: Sun, 19 Jul 2015 17:21:32 +0300
Subject: [PATCH 5/6] Made libastyle unpack a separate branch, since
 distinction between x86/x64 and ARM versions is needed

---
 build/build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 89e02f0b039..6ad28c8b4d4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -670,7 +670,7 @@
     <chmod perm="755" file="linux/work/lib/libastylej.so" />
   </target>
 
-  <target name="arm-build" depends="linux-build linux-libastyle-arm" description="Build linux (32-bit) version">
+  <target name="arm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
     </antcall>
@@ -686,7 +686,7 @@
     <antcall target="package-library-index-json-bundle"/>
   </target>
 
-  <target name="linux32-build" depends="linux-build linux-libastyle-x86" description="Build linux (32-bit) version">
+  <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
     </antcall>
@@ -702,7 +702,7 @@
     <antcall target="package-library-index-json-bundle"/>
   </target>
 
-  <target name="linux64-build" depends="linux-build linux-libastyle-x86" description="Build linux (64-bit) version">
+  <target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
     </antcall>

From ba7ef99ebc521a7b27796b8d9d8f26914da25d81 Mon Sep 17 00:00:00 2001
From: CRImier <crimier@yandex.ru>
Date: Sun, 19 Jul 2015 17:24:08 +0300
Subject: [PATCH 6/6] Added checksum files for armhf versions of avr-gcc and
 avrdude packages

---
 .../linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha  | 1 +
 .../linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha  | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha

diff --git a/build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..bd08ffca744
--- /dev/null
+++ b/build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+f52585a4f98440ba569a60faf178e272668a5ee7
diff --git a/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..29cd7b33d28
--- /dev/null
+++ b/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+f65cf0d340fc38dca7d9b20af56bf3523815ceef