Merge branch 'master' into esp8266

* master: (414 commits)
  Don't export sketch if the underlying core does not support it. Fixes #3171
  RSyntaxTextArea: using a modified version, tracked at https://github.com/arduino/RSyntaxTextArea. Fixes #3099
  Updated keywords.txt
  New editor on MacOSX: since CMD+J is known as "jump to selection" and the editor has no such feature, CMD+J is disabled on mac. See #3098
  Old Preferences class remains for backwards compatibility as a delegate for PreferencesData
  New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140
  Remove spawn from exec command
  Removed redundant call to File.deleteIfExists()
  Removed buggy redundant check in FileUtils.deleteIfExists()
  Restored current line/current selected lines display on lower left of the IDE. Fixes #3134
  Updated cursor.ino
  New editor on MacOSX: restored CMD+E for finding selected text
  New editor on MacOSX: CMD+UP/DOWN moves cursor to start or end of sketch. See #3098
  New editor on MacOSX: CMD+BACKSPACE deletes current line until cursor position, ALT+BACKSPACE deletes previous word. See #3098
  ArduinoIDE is in the default package. Removed
  Fixes  #2969:
  Fix Uncategorized warning message
  New editor: ALT+ BACKSPACE deletes next word (OSX only). See #3098
  New editor: ALT+ UP/DOWN move current line only if "editor.advanced" (hidden pref) is true. Fixes #3101
  New editor: mark occurrences enable when "editor.advanced" (hidden pref) is true. Fixes #3102
  ...

Conflicts:
	.gitignore
	build/build.xml
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/keywords.txt
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/library.properties
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
	libraries/WiFi/README.adoc
	libraries/WiFi/src/WiFi.cpp
	libraries/WiFi/src/WiFiClient.cpp
	libraries/WiFi/src/WiFiClient.h
	libraries/WiFi/src/WiFiServer.cpp
	libraries/WiFi/src/WiFiUdp.cpp

build/build.xml

@@ -4,35 +4,38 @@
   <!--echo message="os.arch = ${os.arch}" /-->
   <!--echo message="os.version = ${os.version}" /-->
 
+  <tstamp>
+    <format property="BUILD_DATE" pattern="yyyy/MM/dd hh:mm"/>
+  </tstamp>
+
   <!-- Sets properties for macosx/windows/linux depending on current system -->
-  <condition property="platform" value="macosx">
+  <condition property="platform" value="macosx-old">
     <and>
       <os family="mac" />
       <matches string="${os.version}" pattern="^10.[56]." />
     </and>
   </condition>
-  <condition property="platform" value="macosx-java-latest"><os family="mac" /></condition>
+  <condition property="platform" value="macosx"><os family="mac" /></condition>
   <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="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
   <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
-  <condition property="macosx"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
-  <condition property="macosx-java-latest"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
   <condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
   <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="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-java-latest" /></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_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx-java-latest" /></condition>
-  <condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></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>
@@ -54,21 +57,14 @@
   <fileset dir=".." id="runtime.jars">
     <include name="arduino-core/arduino-core.jar" />
     <include name="app/pde.jar" />
-    <include name="app/lib/commons-codec-1.7.jar" />
-    <include name="app/lib/commons-exec-1.1.jar" />
-    <include name="app/lib/commons-httpclient-3.1.jar" />
-    <include name="app/lib/commons-logging-1.0.4.jar" />
-    <include name="app/lib/ecj.jar" />
-    <include name="app/lib/jmdns-3.4.1.jar" />
-    <include name="app/lib/jna.jar" />
-    <include name="app/lib/jsch-0.1.50.jar" />
-    <include name="app/lib/jssc-2.8.0.jar" />
-    <include name="app/lib/ant.jar" />
-    <include name="app/lib/ant-launcher.jar" />
+    <include name="app/lib/*.jar" />
+    <include name="arduino-core/lib/*.jar" />
   </fileset>
 
   <target name="build" description="Build Arduino.">
     <antcall target="${platform}-build" />
+
+    <antcall target="generate-hourly-build-txt"/>
   </target>
 
   <target name="run" description="Run Arduino.">
@@ -115,30 +111,16 @@
   <!-- - - - - - - - - -->
 
   <target name="assemble">
-    <fail unless="target.path"
-	  message="Do not call assemble from the command line." />
+    <fail unless="target.path" message="Do not call assemble from the command line." />
 
     <!-- copy shared tools folder -->
     <copy todir="${target.path}/tools">
       <fileset dir="shared/tools" />
     </copy>
 
-    <!-- copy library folder -->
-    <copy todir="${target.path}/libraries">
-      <fileset dir="../libraries" />
-    </copy>
+    <antcall target="assemble-hardware" />
 
-    <!-- copy hardware folder -->
-    <copy todir="${target.path}/hardware">
-      <fileset dir="../hardware">
-        <exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/svd/"/>
-        <exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/html/"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M0*"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M4*"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M0*"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M4*"/>
-      </fileset>
-    </copy>
+    <copy file="../hardware/platform.keys.rewrite.txt" todir="${staging_folder}/work/${staging_hardware_folder}"/>
 
 
     <!-- copy shared examples folder -->
@@ -149,15 +131,49 @@
     <!-- Unzip documentation -->
     <antcall target="unzip">
       <param name="archive_file" value="shared/reference-1.6.0.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/reference-1.6.0.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.0.zip" />
       <param name="final_folder" value="${target.path}/reference" />
       <param name="dest_folder" value="${target.path}" />
     </antcall>
+    <antcall target="unzip">
+      <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" />
+      <param name="final_folder" value="${target.path}/reference/Galileo_help_files" />
+      <param name="dest_folder" value="${target.path}/reference/" />
+    </antcall>
+    <antcall target="unzip">
+      <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
+      <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
+      <param name="dest_folder" value="${target.path}/reference/" />
+    </antcall>
 
     <!-- Write the revision file! -->
     <echo file="${target.path}/lib/version.txt" message="${version}" />
+
+    <antcall target="assemble-libraries" />
   </target>
 
+  <!-- copy library folder -->
+  <target name="assemble-libraries" unless="light_bundle">
+    <copy todir="${target.path}/libraries">
+      <fileset dir="../libraries">
+        <!-- exluding non AVR libraries -->
+        <exclude name="**/Audio/**"/>
+        <exclude name="**/Scheduler/**"/>
+        <exclude name="**/USBHost/**"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- copy hardware folder -->
+  <target name="assemble-hardware" unless="light_bundle">
+    <copy todir="${target.path}/hardware">
+      <fileset dir="../hardware">
+        <exclude name="arduino/sam/**"/>
+      </fileset>
+    </copy>
+  </target>
 
   <!-- - - - - - - - - -->
   <!-- Revision check  -->
@@ -199,9 +215,9 @@
   <!-- Mac OS X      -->
   <!-- - - - - - - - -->
 
-  <target name="macosx-java-latest-clean" depends="macosx-clean" description="Clean Mac OS X build"/>
+  <target name="macosx-clean" depends="macosx-old-clean" description="Clean Mac OS X build"/>
 
-  <target name="macosx-clean" depends="subprojects-clean" description="Clean Mac OS X build">
+  <target name="macosx-old-clean" depends="subprojects-clean" description="Clean Mac OS X build">
     <delete dir="macosx/work" />
     <delete dir="macosx/working_dir" />
     <delete dir="macosx/working.dmg" />
@@ -222,8 +238,9 @@
     <fail message="wrong platform (${os.name})" />
   </target>
 
-  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
+  <target name="macosx-old-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
     <mkdir dir="macosx/work" />
+    <mkdir dir="macosx/work/${staging_hardware_folder}" />
 
     <!-- assemble the pde -->
     <copy todir="macosx/work/Arduino.app">
@@ -250,20 +267,21 @@
 
   </target>
 
-  <target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino2.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
-      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
-    </antcall>
-
+  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
+    <fail unless="MACOSX_BUNDLED_JVM" message="MacOSX requires MACOSX_BUNDLED_JVM property set"/>
     <mkdir dir="${staging_folder}/work" />
 
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino2/appbundler-1.0ea-arduino2.jar"/>
+    <antcall target="unzip">
+      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-upstream1.jar.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-upstream1.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-upstream1" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-upstream1" />
+    </antcall>
+
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-upstream1/appbundler-1.0ea-upstream1.jar"/>
 
     <bundleapp
-            jvmRequired="1.7"
+            jvmRequired="1.8"
             outputdirectory="${staging_folder}/work"
             name="Arduino"
             displayname="Arduino"
@@ -278,6 +296,8 @@
             minimumsystemversion="10.7"
             highresolutioncapable="true">
 
+      <runtime dir="${MACOSX_BUNDLED_JVM}"/>
+
       <arch name="x86_64"/>
       <arch name="i386"/>
 
@@ -305,16 +325,19 @@
       <option value="-Dfile.encoding=UTF-8"/>
 
       <option value="-Xms128M"/>
-      <option value="-Xmx1024M"/>
+      <option value="-Xmx512M"/>
+      <option value="-splash:$APP_ROOT/Contents/Java/lib/splash.png"/>
 
       <bundledocument extensions="ino,c,cpp,h"
                       icon="macosx/template.app/Contents/Resources/pde.icns"
                       name="Arduino Source File"
-                      role="Editor">
+                      role="Editor" ispackage="false">
       </bundledocument>
 
     </bundleapp>
 
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
+
     <copy todir="${staging_folder}/work/${staging_hardware_folder}/../">
       <fileset dir="shared" includes="lib/**" />
       <fileset file="shared/revisions.txt" />
@@ -325,42 +348,20 @@
   </target>
 
   <target name="macosx-build-common">
+    <mkdir dir="${staging_folder}/work" />
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
 
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-mac32-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
+    <antcall target="macosx-build-common-avr-toolchain" />
 
-    <copy todir="macosx/work/${staging_hardware_folder}/tools/">
-      <fileset file="macosx/dist/bossac" />
-    </copy>
-
-    <chmod file="macosx/work/${staging_hardware_folder}/tools/bossac" perm="+x" />
+    <antcall target="package-library-index-json-bundle"/>
 
     <antcall target="assemble">
-      <param name="target.path" value="macosx/work/${staging_hardware_folder}/../" />
+      <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
     </antcall>
 
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
-    </antcall>
-
-    <delete includeEmptyDirs="true" quiet="true">
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/3.4.6/**/*"/>
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/3.4.6"/>
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man/**/*"/>
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
-    </delete>
-
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/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>
@@ -369,12 +370,25 @@
     <copy file="macosx/libastylej/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
     <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 
+  </target>
+
+  <!-- Unzip AVR tools -->
+  <target name="macosx-build-common-avr-toolchain" unless="light_bundle">
+    <antcall target="avr-toolchain-bundle">
+      <param name="unpack_target" value="untar"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"/>
+      <param name="avrdude_version" value="6.0.1-arduino5"/>
+    </antcall>
+
     <chmod perm="+x">
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/bin" includes="**/*" />
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/avr/bin" includes="**/*" />
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/libexec/gcc/avr/4.8.1/" includes="*" />
+      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
+      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
     </chmod>
 
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266" />
+
     <antcall target="untar">
       <param name="archive_file" value="${staging_folder}/dist/osx-xtensa-lx106-elf.tgz" />
       <param name="archive_url" value="http://download.igrr.me/osx-xtensa-lx106-elf.tgz" />
@@ -382,6 +396,7 @@
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
     </antcall>
 
+    
     <antcall target="unzip">
       <param name="archive_file" value="${staging_folder}/esptool-0.4.3-osx.zip" />
       <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-osx.zip" />
@@ -393,30 +408,30 @@
 
   </target>
 
-  <target name="macosx-run" depends="macosx-build" description="Run Mac OS X version">
+  <target name="macosx-old-run" depends="macosx-old-build" description="Run Mac OS X version">
     <antcall target="macosx-run-common"/>
   </target>
 
-  <target name="macosx-java-latest-run" depends="macosx-java-latest-build" description="Run Mac OS X version">
+  <target name="macosx-run" depends="build" description="Run Mac OS X version">
     <antcall target="macosx-run-common"/>
   </target>
 
-  <target name="macosx-debug" depends="macosx-build" description="Run Mac OS X version">
+  <target name="macosx-old-debug" depends="macosx-old-build" description="Run Mac OS X version">
     <antcall target="macosx-debug-common"/>
   </target>
 
-  <target name="macosx-java-latest-debug" depends="macosx-java-latest-build" description="Run Mac OS X version">
+  <target name="macosx-debug" depends="build" description="Run Mac OS X version">
     <antcall target="macosx-debug-common"/>
   </target>
 
   <target name="macosx-run-common">
-    <exec executable="open" dir="macosx/work">
+    <exec executable="open" dir="macosx/work" failonerror="true">
       <arg value="Arduino.app"/>
     </exec>
   </target>
 
   <target name="macosx-debug-common">
-    <exec executable="open" dir="macosx/work" spawn="false">
+    <exec executable="open" dir="macosx/work" spawn="false" failonerror="true">
       <arg value="Arduino.app"/>
     </exec>
   </target>
@@ -432,18 +447,18 @@
     <delete dir="macosx/work/Arduino.app" />
 
     <!-- Unzip unsigned app into working dir -->
-    <exec executable="unzip" dir="macosx/work">
+    <exec executable="unzip" dir="macosx/work" failonerror="true">
       <arg line="../arduino-${version}-${platform}.zip" />
     </exec>
 
     <!-- Unlock keychain file -->
-    <exec executable="security" dir="macosx/work">
+    <exec executable="security" dir="macosx/work" failonerror="true">
       <arg line="unlock-keychain -p &quot;${macosx-sign-keychain-pass}&quot; &quot;${macosx-sign-keychain}&quot;" />
     </exec>
 
     <!-- Sign app -->
-    <exec executable="codesign" dir="macosx/work">
-      <arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
+    <exec executable="codesign" dir="macosx/work" failonerror="true">
+      <arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; --deep -v Arduino.app/" />
     </exec>
 
     <!-- Check for successful signing -->
@@ -454,7 +469,7 @@
     <delete file="macosx/arduino-${version}-${platform}.zip" />
 
     <!-- Create signed zip file -->
-    <exec executable="zip" dir="macosx/work">
+    <exec executable="zip" dir="macosx/work" failonerror="true">
       <arg line="-q -r ../arduino-${version}-${platform}-signed.zip ." />
     </exec>
 
@@ -476,16 +491,16 @@
   <!-- - - - - - - - - - - - - - - - - - - -->
   <!-- Build distribution file for MacOSX. -->
   <!-- - - - - - - - - - - - - - - - - - - -->
-  <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a downloadable .zip for the Mac OS X version">
+  <target name="macosx-old-dist" if="macosx" depends="macosx-old-build" description="Create a downloadable .zip for the Mac OS X version">
     <antcall target="macosx-dist-common"/>
   </target>
 
-  <target name="macosx-java-latest-dist" if="macosx" depends="macosx-java-latest-build" description="Create a downloadable .zip for the Mac OS X version">
+  <target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
     <antcall target="macosx-dist-common"/>
   </target>
 
   <target name="macosx-dist-common">
-    <exec executable="zip" dir="macosx/work">
+    <exec executable="zip" dir="macosx/work" failonerror="true">
       <arg line="-q -r ../arduino-${version}-${platform}.zip ." />
     </exec>
 
@@ -498,59 +513,70 @@
     </echo>
   </target>
 
-  <target name="macosx-dist-old" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">
-    <!-- now build the dmg -->
-    <gunzip src="macosx/template.dmg.gz" dest="macosx/working.dmg" />
+  <!--<target name="macosx-dist-old" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">-->
+    <!--&lt;!&ndash; now build the dmg &ndash;&gt;-->
+    <!--<gunzip src="macosx/template.dmg.gz" dest="macosx/working.dmg" />-->
 
-    <mkdir dir="macosx/working_dir" />
-    <exec executable="hdiutil">
-      <arg line="attach macosx/working.dmg -noautoopen -mountpoint macosx/working_dir" />
-      <!--<arg line="attach macosx/working.dmg -noautoopen -quiet -mountpoint macosx/working_dir" />-->
-    </exec>
+    <!--<mkdir dir="macosx/working_dir" />-->
+    <!--<exec executable="hdiutil">-->
+      <!--<arg line="attach macosx/working.dmg -noautoopen -mountpoint macosx/working_dir" />-->
+      <!--&lt;!&ndash;<arg line="attach macosx/working.dmg -noautoopen -quiet -mountpoint macosx/working_dir" />&ndash;&gt;-->
+    <!--</exec>-->
 
-    <copy todir="macosx/working_dir">
-      <fileset dir="macosx/work" />
-    </copy>
+    <!--<copy todir="macosx/working_dir">-->
+      <!--<fileset dir="macosx/work" />-->
+    <!--</copy>-->
 
-    <!-- The ant copy command does not preserve permissions. -->
-    <chmod file="macosx/working_dir/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />
-    <chmod perm="+x">
-      <fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />
-      <fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />
-      <fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />
-      <fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />
-      <fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/3.4.6/" includes="**/cc1*" />
-      <fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />
-    </chmod>
+    <!--&lt;!&ndash; The ant copy command does not preserve permissions. &ndash;&gt;-->
+    <!--<chmod file="macosx/working_dir/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />-->
+    <!--<chmod perm="+x">-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/3.4.6/" includes="**/cc1*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />-->
+    <!--</chmod>-->
 
-    <!-- Pause briefly for the OS to catch up with the DMG changes. 
-	 This prevents "hdiutil: couldn't eject "disk3" - Resource busy"
-	 errors when ejecting the disk in the next step.
-         You may need to set this value higher for your system. -->
-    <sleep seconds="3" />
+    <!--&lt;!&ndash; Pause briefly for the OS to catch up with the DMG changes. -->
+	 <!--This prevents "hdiutil: couldn't eject "disk3" - Resource busy"-->
+	 <!--errors when ejecting the disk in the next step.-->
+         <!--You may need to set this value higher for your system. &ndash;&gt;-->
+    <!--<sleep seconds="3" />-->
 
-    <exec executable="hdiutil">
-      <!--<arg line="detach macosx/working_dir -quiet -force" />-->
-      <arg line="detach macosx/working_dir" />
-    </exec>
+    <!--<exec executable="hdiutil">-->
+      <!--&lt;!&ndash;<arg line="detach macosx/working_dir -quiet -force" />&ndash;&gt;-->
+      <!--<arg line="detach macosx/working_dir" />-->
+    <!--</exec>-->
 
-    <delete file="macosx/arduino-*.dmg" />
-    <exec executable="hdiutil">
-      <arg line="convert macosx/working.dmg -quiet -format UDZO -imagekey zlib-level=9 -o macosx/arduino-${version}.dmg" />
-    </exec>
+    <!--<delete file="macosx/arduino-*.dmg" />-->
+    <!--<exec executable="hdiutil">-->
+      <!--<arg line="convert macosx/working.dmg -quiet -format UDZO -imagekey zlib-level=9 -o macosx/arduino-${version}.dmg" />-->
+    <!--</exec>-->
 
-    <!-- Clean up the interim files. -->
-    <delete file="macosx/working.dmg" />
-    <delete dir="macosx/working_dir" />
+    <!--&lt;!&ndash; Clean up the interim files. &ndash;&gt;-->
+    <!--<delete file="macosx/working.dmg" />-->
+    <!--<delete dir="macosx/working_dir" />-->
 
-    <echo>
-      =======================================================
-      Arduino for Mac OS X was built. Grab the image from
+    <!--<echo>-->
+      <!--=======================================================-->
+      <!--Arduino for Mac OS X was built. Grab the image from-->
 
-      macosx/arduino-${version}.dmg
-      =======================================================
-    </echo>
-  </target>
+      <!--macosx/arduino-${version}.dmg-->
+      <!--=======================================================-->
+    <!--</echo>-->
+  <!--</target>-->
+
+  <!--<target name="macosx-dist-old-fix-perms" unless="light_bundle">-->
+    <!--<chmod perm="+x">-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/3.4.6/" includes="**/cc1*" />-->
+      <!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />-->
+    <!--</chmod>-->
+  <!--</target>-->
 
   <!-- - - - - - - - -->
   <!-- Linux         -->
@@ -577,6 +603,7 @@
 
   <target name="linux-build" depends="revision-check, linux-checkos, subprojects-build" description="Build linux version">
     <mkdir dir="linux/work" />
+    <mkdir dir="linux/work/${staging_hardware_folder}" />
 
     <copy todir="linux/work">
       <fileset dir="shared" includes="lib/**" />
@@ -596,23 +623,16 @@
     </antcall>
 
     <copy todir="linux/work" file="linux/dist/arduino" />
+    <copy todir="linux/work" file="linux/dist/arduino.desktop" />
+    <copy todir="linux/work" file="linux/dist/install.sh" />
     <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/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
-
-    <chmod perm="755" file="linux/work/hardware/tools/bossac" />
-    <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
-    <chmod perm="755" file="linux/work/hardware/tools/adk2install" />
-
     <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://arduino.cc/download.php?f=/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>
@@ -621,39 +641,29 @@
   </target>
 
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
-    <!-- Unzip ARM tools -->
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
+    <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>
 
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux32-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
+    <antcall target="package-library-index-json-bundle"/>
   </target>
 
   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
-    <!-- Unzip ARM tools -->
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
+    <antcall target="avr-toolchain-bundle">
+      <param name="unpack_target" value="untar"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-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-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="6.0.1-arduino5"/>
     </antcall>
 
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux64-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
+    <antcall target="package-library-index-json-bundle"/>
+
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266" />
 
     <antcall target="untar">
       <param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf.tgz" />
@@ -673,12 +683,12 @@
 
   </target>
 
-  <target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
-    <exec executable="./linux/work/arduino" spawn="false"/>
+  <target name="linux32-run" depends="build" description="Run Linux (32-bit) version">
+    <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
-  <target name="linux64-run" depends="linux64-build" description="Run Linux (64-bit) version">
-    <exec executable="./linux/work/arduino" spawn="false"/>
+  <target name="linux64-run" depends="build" description="Run Linux (64-bit) version">
+    <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
   </target>
 
   <!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded              -->
@@ -709,8 +719,8 @@
 
   <!-- Ensure that the tool is downloaded and test checksums, if everything's ok unzip it on the tools folder  -->
   <target name="untar" depends="untar-unzip-checksum" unless="${archive_file}_installed">
-    <echo>Unzipping into folder ${dest_folder}</echo>
-    <exec executable="tar">
+    <echo>Untarring ${archive_file} into folder ${dest_folder}</echo>
+    <exec executable="tar" failonerror="true">
       <arg value="xf"/>
       <arg value="${archive_file}"/>
       <arg value="--directory=${dest_folder}"/>
@@ -718,9 +728,9 @@
   </target>
 
   <target name="unzip" depends="untar-unzip-checksum" unless="${archive_file}_installed">
-    <echo>Unzipping into folder ${dest_folder}</echo>
+    <echo>Unzipping ${archive_file} into folder ${dest_folder}</echo>
     <mkdir dir="${dest_folder}" />
-    <exec executable="unzip">
+    <exec executable="unzip" failonerror="true">
       <arg value="-q" />
       <arg value="-n" />
       <arg value="-d" />
@@ -729,12 +739,18 @@
     </exec>
   </target>
 
+  <target name="unzip-with-ant-task" depends="untar-unzip-checksum" unless="${archive_file}_installed">
+    <echo>Unzipping ${archive_file} into folder ${dest_folder}</echo>
+    <mkdir dir="${dest_folder}" />
+    <unzip src="${archive_file}" dest="${dest_folder}"/>
+  </target>
+
   <target name="linux-dist" depends="build"
 	  description="Build .tar.xz of linux version">
 
     <move file="linux/work" tofile="linux/arduino-${version}" />
 
-    <exec executable="tar" dir="linux">
+    <exec executable="tar" dir="linux" failonerror="true">
       <arg value="--lzma"/>
       <arg value="-c"/>
       <arg value="-f"/>
@@ -784,23 +800,28 @@
   </target>
 
   <target name="download-launch4j-windows">
-    <get src="http://heanet.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-win32.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
-    <unzip dest="windows/launcher/" src="windows/launch4j-3.0.2-win32.zip" overwrite="true"/>
+    <antcall target="unzip-with-ant-task">
+      <param name="archive_file" value="windows/launch4j-3.7-win32.zip"/>
+      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.7/launch4j-3.7-win32.zip"/>
+      <param name="final_folder" value="windows/launcher/launch4j"/>
+      <param name="dest_folder" value="windows/launcher/"/>
+    </antcall>
   </target>
 
   <target name="download-launch4j-linux">
-    <get src="http://heanet.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
-
-    <exec executable="tar" dir="windows/launcher">
-      <arg value="-xf"/>
-      <arg value="../launch4j-3.0.2-linux.tgz"/>
-    </exec>
+    <antcall target="untar">
+      <param name="archive_file" value="windows/launch4j-3.7-linux.tgz"/>
+      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.7/launch4j-3.7-linux.tgz"/>
+      <param name="final_folder" value="windows/launcher/launch4j"/>
+      <param name="dest_folder" value="windows/launcher/"/>
+    </antcall>
   </target>
 
   <target name="windows-build"
 	  depends="revision-check, windows-checkos, subprojects-build"
 	  description="Build windows version">
     <mkdir dir="windows/work" />
+    <mkdir dir="windows/work/${staging_hardware_folder}" />
 
     <!-- assemble the pde -->
     <mkdir dir="windows/work/lib" />
@@ -824,17 +845,11 @@
       <fileset dir="windows/dist" includes="drivers/**" />
     </copy>
 
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-win32-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-win32-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
+    <antcall target="windows-build-avr-toolchain" />
 
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/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>
@@ -842,13 +857,11 @@
     <copy file="windows/msvcp100.dll" todir="windows/work" />
     <copy file="windows/msvcr100.dll" todir="windows/work" />
 
-    <!-- Copy bossac.exe tool -->
+    <!-- Copy listComPort.exe tool -->
     <copy todir="windows/work/hardware/tools">
-      <fileset file="windows/bossac.exe" />
       <fileset file="windows/listComPorts.exe" />
     </copy>
     <chmod perm="755">
-      <fileset file="windows/work/hardware/tools/bossac.exe" />
       <fileset file="windows/work/hardware/tools/listComPorts.exe" />
     </chmod>
 
@@ -856,6 +869,7 @@
       <param name="target.path" value="windows/work" />
     </antcall>
 
+    <delete dir="windows/launcher/launch4j"/>
     <antcall target="download-${launch4j-download-unpack-target-name}" />
 
     <property name="launch4j.dir" value="windows/launcher/launch4j/" />
@@ -865,11 +879,11 @@
 
     <copy todir="windows/work">
       <fileset dir="windows/launcher"
-	       includes="about.bmp, application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
+	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
     </copy>
     <launch4j configFile="windows/work/config.xml" />
     <launch4j configFile="windows/work/config_debug.xml" />
-    <delete dir="windows/work" includes="about.bmp, application.ico, config.xml, config_debug.xml" />
+    <delete dir="windows/work" includes="application.ico, config.xml, config_debug.xml" />
     <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />
 
     <!-- cygwin requires html, dll, and exe to have the +x flag -->
@@ -877,18 +891,34 @@
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
     </chmod>
 
-    <!-- Unzip ARM toolchain -->
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
+    <loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
+
+    <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
+      <condition>
+        <not>
+          <equals arg1="${windows.OS_NAME}" arg2="&quot;Windows&quot;"/>
+        </not>
+      </condition>
+    </fail>
+
+    <copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
+      <fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
+    </copy>
+  </target>
+
+  <target name="windows-build-avr-toolchain">
+    <antcall target="avr-toolchain-bundle">
+      <param name="unpack_target" value="unzip"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
+      <param name="gcc_version" value="4.8.1-arduino5"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
+      <param name="avrdude_version" value="6.0.1-arduino5"/>
     </antcall>
 
-    <delete includeEmptyDirs="true" quiet="true">
-      <fileset dir="windows/work/hardware/tools/avr/doc" />
-    </delete>
+    <antcall target="package-library-index-json-bundle"/>
 	
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266" />
+
   	<antcall target="untar">
       <param name="archive_file" value="${staging_folder}/dist/win32-xtensa-lx106-elf.tgz" />
       <param name="archive_url" value="http://download.igrr.me/win32-xtensa-lx106-elf.tgz" />
@@ -908,31 +938,14 @@
  
   </target>
 
-  <target name="windows-run" depends="windows-build"
+  <target name="windows-run" depends="build"
 	  description="Run windows version">
-    <exec executable="windows/work/arduino.exe"
-	  dir="windows/work" spawn="true"/>
+    <exec executable="windows/work/arduino.exe" dir="windows/work" failonerror="true"/>
   </target>
 
-  <target name="windows-dist" depends="windows-build" description="Create .zip files of windows version">
-
-    <loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
-
-    <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
-      <condition>
-        <not>
-          <equals arg1="${windows.OS_NAME}" arg2="&quot;Windows&quot;"/>
-        </not>
-      </condition>
-    </fail>
-
-    <copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
-      <fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
-    </copy>
-
+  <target name="windows-dist" depends="build" description="Create .zip files of windows version">
     <zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
-      <zipfileset dir="windows/work"
-		  prefix="arduino-${version}" />
+      <zipfileset dir="windows/work" prefix="arduino-${version}"/>
     </zip>
 
     <echo>
@@ -986,4 +999,63 @@
 	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
   </target>
 
+  <target name="avr-toolchain-bundle" unless="light_bundle">
+    <!-- Unzip AVR tools -->
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
+
+    <antcall target="${unpack_target}">
+      <param name="archive_file" value="${staging_folder}/${gcc_archive_file}"/>
+      <param name="archive_url" value="http://downloads.arduino.cc/tools/${gcc_archive_file}"/>
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/${gcc_version}/"/>
+      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/"/>
+    </antcall>
+
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude"/>
+
+    <antcall target="${unpack_target}">
+      <param name="archive_file" value="${staging_folder}/${avrdude_archive_file}"/>
+      <param name="archive_url" value="http://downloads.arduino.cc/tools/${avrdude_archive_file}"/>
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/${avrdude_version}"/>
+      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/>
+    </antcall>
+
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
+    <antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
+
+    <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
+    <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
+  </target>
+
+  <target name="package-library-index-json-bundle">
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
+
+    <get src="http://downloads.arduino.cc/packages/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
+    <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
+    <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"/>
+
+    <get src="http://downloads.arduino.cc/packages/package_index.json.sig" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
+
+    <get src="http://downloads.arduino.cc/libraries/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
+    <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
+    <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"/>
+
+    <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
+  </target>
+
+  <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
+    <exec executable="mv" failonerror="true">
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
+    </exec>
+    <exec executable="mv" failonerror="true">
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
+    </exec>
+  </target>
+
+  <target name="generate-hourly-build-txt" if="hourly">
+    <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
+  </target>
+
 </project>

build/build_all_dist.bash

@@ -0,0 +1,20 @@
+#!/bin/bash -ex
+
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd $DIR
+
+rm -f ../arduino-*.tar.xz
+rm -f ../arduino-*.zip
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=linux32 $@ clean dist
+mv linux/arduino-*-linux32.tar.xz ../
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 $@ clean dist
+mv linux/arduino-*-linux64.tar.xz ../
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=windows $@ clean dist
+mv windows/arduino-*-windows.zip ../
+
+ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx $@ clean dist
+mv macosx/arduino-*-macosx.zip ../
+

build/build_pull_request.bash

@@ -1,11 +1,14 @@
 #!/bin/bash -ex
 
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd $DIR
+
 if [ "x${ghprbPullId}" == "x" ]
 then
 	exit 1
 fi
 
-ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dlinux64=1 clean build test
+ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dlinux64=1 clean build
 
 ERRORS=`grep '<error' ../app/test-bin/TEST-*.xml | wc -l`
 if [ $ERRORS -ne 0 ] ;
@@ -15,18 +18,5 @@ fi
 
 VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"
 
-ant -Djava.net.preferIPv4Stack=true -Dplatform=linux32 -Dversion="${VERSION}" clean dist
-mv linux/arduino-*$VERSION*.tar.xz ../
-
-ant -Djava.net.preferIPv4Stack=true -Dplatform=linux64 -Dversion="${VERSION}" clean dist
-mv linux/arduino-*$VERSION*.tar.xz ../
-
-ant -Djava.net.preferIPv4Stack=true -Dplatform=windows -Dversion="${VERSION}" clean dist
-mv windows/arduino-*$VERSION*.zip ../
-
-ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx -Dversion="${VERSION}" clean dist
-mv macosx/arduino-*$VERSION*.zip ../
-
-ant -Djava.net.preferIPv4Stack=true -Dplatform=macosx-java-latest -Dversion="${VERSION}" clean dist
-mv macosx/arduino-*$VERSION*.zip ../
+./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM
 

build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+fdd09172450c3970a55e1876d1fc112d0db626ac

build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+0398e498559c42e45cb98ba13251da7e5b306e0c

build/linux/avr-toolchain-linux32-3.4.5.zip.sha

@@ -1 +0,0 @@
-7be134b7daae4160f069725ab4924759c213b171

build/linux/avr-toolchain-linux64-3.4.5.zip.sha

@@ -1 +0,0 @@
-0c4f955273ba09fe9a5a9bd90b2e8713295ba4b4

build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+cf859c679713cae2f1b9089d797d211dd84fe658

build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+cfc52036f532c3a7050f6d4ec7645d060800aa39

build/linux/dist/arduino

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 CURDIR=`pwd`
 APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
@@ -20,5 +20,13 @@ export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"
 
-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base --curdir $CURDIR "$@"
+if [[ "$@" == *"--upload"* || "$@" == *"--verify"* || "$@" == *"--get-pref"* || "$@" == *"--install-board"* || "$@" == *"--install-library"* ]] ; then
+	SPLASH=""
+else
+	SPLASH="-splash:./lib/splash.png"
+fi
+
+export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
+
+java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
 

build/linux/dist/arduino.desktop

@@ -3,8 +3,8 @@ Type=Application
 Name=Arduino IDE
 GenericName=Integrated Development Environment
 Comment=An IDE for Arduino-compatible electronics prototyping platforms
-Exec=arduino
-Icon=arduino
+Exec=FULL_PATH/arduino
+Icon=FULL_PATH/lib/arduino.png
 Terminal=false
 Categories=Development;IDE;Electronics;
 MimeType=text/x-arduino

build/linux/dist/install.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+CURDIR=`pwd`
+APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
+
+cd "$APPDIR"
+
+# Set arduino.desktop absolute path workaround
+mv arduino.desktop arduino.desktop-bak
+sed -e "s,FULL_PATH,$PWD,g" arduino.desktop-bak > arduino.desktop
+rm arduino.desktop-bak
+
+cp arduino.desktop ~/.local/share/applications/arduino.desktop
+cp arduino.desktop ~/Desktop/arduino.desktop
+
+echo "Instaled Arduino IDE icons on menu and desktop !"
+

build/linux/dist/tools/adk2install

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# simple wrapper around the adk2tool and bossac to properly erase and reset the 
-# adk2 board
-
-echo $1 /dev/$2 erase
-$1 /dev/$2 erase
-
-echo $3 --port=$2 -w -e -v -b $4
-$3 --port=$2 -w -e -v -b $4
-
-echo $1 /dev/$2 reset
-$1 /dev/$2 reset
-

build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha

@@ -1 +0,0 @@
-929bc65f3ba6ecb868254a6328f8502ad86fe4e5

build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha

@@ -0,0 +1 @@
+5bb6377a65edf7af7b5b3820711bab0e377bdee1

build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha

@@ -0,0 +1 @@
+1ea737a217e0dde0a338fff070cc3010669ab6f1

build/macosx/avr-toolchain-mac32-3.4.5.zip.sha

@@ -1 +0,0 @@
-7883269bd9ba654ed6ca943d983c02c8691b858b

build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha

@@ -0,0 +1 @@
+1eb447a6c11f374d71e91bf4c381380216f9a476

build/macosx/template.app/Contents/Info.plist

@@ -81,12 +81,15 @@
       <key>VMOptions</key>
       <array>
         <string>-Xms128M</string>
-        <string>-Xmx1024M</string>
+        <string>-Xmx512M</string>
       </array>
 
       <key>MainClass</key>
       <string>processing.app.Base</string>
 
+      <key>SplashFile</key>
+      <string>$APP_PACKAGE/Contents/Resources/Java/lib/splash.png</string>
+
       <key>JVMVersion</key>
       <string>1.6*</string>
 
@@ -94,7 +97,7 @@
       <!-- In 0149, removed /System/Library/Java from the CLASSPATH because
            it can cause problems if users have installed weird files there.
            http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
-      <string>$JAVAROOT/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jna.jar</string>
+      <string>$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/bcpg-jdk15on-152.jar:$JAVAROOT/bcprov-jdk15on-152.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-lang3-3.3.2.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/guava-18.0.jar:$JAVAROOT/jackson-annotations-2.2.3.jar:$JAVAROOT/jackson-core-2.2.3.jar:$JAVAROOT/jackson-databind-2.2.3.jar:$JAVAROOT/jackson-module-mrbean-2.2.3.jar:$JAVAROOT/java-semver-0.8.0.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jna.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/pde.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/rsyntaxtextarea-2.5.6.1+arduino.jar</string>
 
       <key>JVMArchs</key>  
       <array>  

build/shared/Edison_help_files-1.6.2.zip.sha

@@ -0,0 +1 @@
+07a93ab86dadbb33c0182fc2e3034ed3a24cbec6

build/shared/Galileo_help_files-1.6.2.zip.sha

@@ -0,0 +1 @@
+494881c26e4dc58ab67409d72c3d63e3c52ac184

build/shared/examples/01.Basics/AnalogReadSerial/AnalogReadSerial.txt

@@ -0,0 +1 @@
+Read a potentiometer, print its state out to the Arduino Serial Monitor. 

build/shared/examples/01.Basics/BareMinimum/BareMinimum.txt

@@ -0,0 +1 @@
+The bare minimum of code needed to start an Arduino sketch. 

build/shared/examples/01.Basics/Blink/Blink.txt

@@ -0,0 +1 @@
+Turn an LED on and off. 

build/shared/examples/01.Basics/DigitalReadSerial/DigitalReadSerial.txt

@@ -0,0 +1 @@
+Read a switch, print the state out to the Arduino Serial Monitor.

build/shared/examples/01.Basics/Fade/Fade.txt

@@ -0,0 +1 @@
+Demonstrates the use of analog output to fade an LED.

build/shared/examples/01.Basics/ReadAnalogVoltage/ReadAnalogVoltage.txt

@@ -0,0 +1 @@
+Reads an analog input and prints the voltage to the serial monitor.

build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.txt

@@ -0,0 +1 @@
+Blinking an LED without using the delay() function.

build/shared/examples/02.Digital/Button/Button.txt

@@ -0,0 +1 @@
+Use a pushbutton to control an LED. 

build/shared/examples/02.Digital/Debounce/Debounce.txt

@@ -0,0 +1 @@
+Read a pushbutton, filtering noise. 

build/shared/examples/02.Digital/DigitalInputPullup/DigitalInputPullup.txt

@@ -0,0 +1 @@
+Demonstrates the use of INPUT_PULLUP with pinMode(). 

build/shared/examples/02.Digital/StateChangeDetection/StateChangeDetection.txt

@@ -0,0 +1 @@
+Counting the number of button pushes. 

build/shared/examples/02.Digital/toneKeyboard/toneKeyboard.txt

@@ -0,0 +1 @@
+A three-key musical keyboard using force sensors and a piezo speaker. 

build/shared/examples/02.Digital/toneMelody/toneMelody.txt

@@ -0,0 +1 @@
+Play a melody with a Piezo speaker.

build/shared/examples/02.Digital/toneMultiple/toneMultiple.txt

@@ -0,0 +1 @@
+Play tones on multiple speakers sequentially using the tone() command. 

build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.txt

@@ -0,0 +1 @@
+Play a pitch on a piezo speaker depending on an analog input. 

build/shared/examples/03.Analog/AnalogInOutSerial/AnalogInOutSerial.txt

@@ -0,0 +1 @@
+Read an analog input pin, map the result, and then use that data to dim or brighten an LED. 

build/shared/examples/03.Analog/AnalogInput/AnalogInput.txt

@@ -0,0 +1 @@
+Use a potentiometer to control the blinking of an LED. 

build/shared/examples/03.Analog/AnalogWriteMega/AnalogWriteMega.txt

@@ -0,0 +1 @@
+Fade 12 LEDs on and off, one by one, using an Arduino Mega board. 

build/shared/examples/03.Analog/Calibration/Calibration.txt

@@ -0,0 +1 @@
+Define a maximum and minimum for expected analog sensor values. 

build/shared/examples/03.Analog/Fading/Fading.txt

@@ -0,0 +1 @@
+Use an analog output (PWM pin) to fade an LED. 

build/shared/examples/03.Analog/Smoothing/Smoothing.txt

@@ -0,0 +1 @@
+Smooth multiple readings of an analog input. 

build/shared/examples/04.Communication/ASCIITable/ASCIITable.txt

@@ -0,0 +1 @@
+Demonstrates Arduino's advanced serial output functions.

build/shared/examples/04.Communication/Dimmer/Dimmer.txt

@@ -0,0 +1 @@
+Move the mouse to change the brightness of an LED. 

build/shared/examples/04.Communication/Graph/Graph.txt

@@ -0,0 +1 @@
+Send data to the computer and graph it in Processing. 

build/shared/examples/04.Communication/Midi/MIDI.txt

@@ -0,0 +1 @@
+Send MIDI note messages serially. 

build/shared/examples/04.Communication/MultiSerialMega/MultiSerialMega.txt

@@ -0,0 +1 @@
+Use two of the serial ports available on the Arduino Mega.