From b0332f0c36d789bb0519a0e10d0996b8a8ef7f3d Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 26 Jul 2013 18:42:23 +0200
Subject: [PATCH] Revert "avrdude -> avrdude32"

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

diff --git a/build/build.xml b/build/build.xml
index ae468d86e..35e6fcc7a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -20,13 +20,6 @@
   <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" />
@@ -470,15 +463,13 @@
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
-    <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" />
+    <copy todir="linux/work/hardware">
+      <fileset dir="linux/dist" includes="tools/**" />
+    </copy>
 
     <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/avrdude32 b/build/linux/dist/tools/avrdude
similarity index 100%
rename from build/linux/dist/tools/avrdude32
rename to build/linux/dist/tools/avrdude
diff --git a/build/linux/dist/tools/bossac32 b/build/linux/dist/tools/bossac
similarity index 100%
rename from build/linux/dist/tools/bossac32
rename to build/linux/dist/tools/bossac