Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x

app/src/processing/app/Base.java

@@ -132,7 +132,7 @@ public class Base {
       File versionFile = getContentFile("lib/version.txt");
       if (versionFile.exists()) {
         String version = PApplet.loadStrings(versionFile)[0];
-        if (!version.equals(VERSION_NAME)) {
+        if (!version.equals(VERSION_NAME) && !version.equals("${version}")) {
           VERSION_NAME = version;
           RELEASE = true;
         }
@@ -141,6 +141,10 @@ public class Base {
       e.printStackTrace();
     }
 
+    // help 3rd party installers find the correct hardware path
+    Preferences.set("last.ide." + VERSION_NAME + ".hardwarepath", getHardwarePath());
+    Preferences.set("last.ide." + VERSION_NAME + ".daterun", "" + (new Date()).getTime() / 1000);
+
 //    if (System.getProperty("mrj.version") != null) {
 //      //String jv = System.getProperty("java.version");
 //      String ov = System.getProperty("os.version");

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" />