From a1f04cc3c0a8c8de28e74b06fedb091c9cab2eca Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 26 Jul 2013 17:55:11 +0200
Subject: [PATCH] avrdude -> avrdude32 bossac -> bossac32 adapted build.xml to
 copy the right avrdude and bossac according to target arch

---
 build/build.xml                               |  17 +++++++++++++----
 build/linux/dist/tools/{avrdude => avrdude32} | Bin
 build/linux/dist/tools/{bossac => bossac32}   | Bin
 3 files changed, 13 insertions(+), 4 deletions(-)
 rename build/linux/dist/tools/{avrdude => avrdude32} (100%)
 rename build/linux/dist/tools/{bossac => bossac32} (100%)

diff --git a/build/build.xml b/build/build.xml
index 35e6fcc7a..ae468d86e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -20,6 +20,13 @@
   <condition property="platform"
 	     value="linux64"><os family="unix" arch="amd64" /></condition>
 
+  <condition property="arch-bits" value="32">
+    <equals arg1="${platform}" arg2="linux32"/>
+  </condition>
+  <condition property="arch-bits" value="64">
+    <equals arg1="${platform}" arg2="linux64"/>
+  </condition>
+
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
     <include name="core/core.jar" />
@@ -463,13 +470,15 @@
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
-    <copy todir="linux/work/hardware">
-      <fileset dir="linux/dist" includes="tools/**" />
-    </copy>
+    <mkdir dir="linux/work/hardware/tools" />
+    <copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
+    <copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
+    <copy file="linux/dist/tools/avrdude${arch-bits}" tofile="linux/work/hardware/tools/avrdude" />
+    <copy file="linux/dist/tools/avrdude.conf" todir="linux/work/hardware/tools" />
+    <copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
 
     <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
     <chmod perm="755" file="linux/work/hardware/tools/bossac" />
-    <chmod perm="755" file="linux/work/hardware/tools/bossac64" />
     <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
     <chmod perm="755" file="linux/work/hardware/tools/adk2install" />
 
diff --git a/build/linux/dist/tools/avrdude b/build/linux/dist/tools/avrdude32
similarity index 100%
rename from build/linux/dist/tools/avrdude
rename to build/linux/dist/tools/avrdude32
diff --git a/build/linux/dist/tools/bossac b/build/linux/dist/tools/bossac32
similarity index 100%
rename from build/linux/dist/tools/bossac
rename to build/linux/dist/tools/bossac32