update AVR src

* java code not tested * Merge remote-tracking branch 'remotes/arduino/master' into esp8266 Conflicts: README.md app/src/processing/app/AbstractMonitor.java arduino-core/src/processing/app/Serial.java libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino libraries/WiFi/library.properties
2025-06-22 08:22:04 +03:00 · 2015-06-17 14:22:59 +02:00
parent d8e22e3ca7 5b2ef53045
commit f206d31581
390 changed files with 5510 additions and 12573 deletions
--- a/build/.editorconfig
+++ b/build/.editorconfig
@ -0,0 +1,16 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
+
+[*.{md,adoc}]
+indent_style = space
+trim_trailing_whitespace = false
--- a/build/Firmata-2.4.3.zip.sha
+++ b/build/Firmata-2.4.3.zip.sha
@ -0,0 +1 @@
+a1c86eb5223801d046c7158dc98be6a74a73da2d
--- a/build/Temboo-1.1.2.zip.sha
+++ b/build/Temboo-1.1.2.zip.sha
@ -0,0 +1 @@
+3765428c8af45e7ef085b53f6408bbb1c0133f6d
--- a/build/build.xml
+++ b/build/build.xml
@ -52,6 +52,24 @@

  <property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
  <property name="WINDOWS_BUNDLED_JVM" value="${java.home}"/>
+  <property name="LINUX32_BUNDLED_JVM" value="none"/>
+  <property name="LINUX64_BUNDLED_JVM" value="none"/>
+  <condition property="linux-bundle-jvm-task" value="noop">
+    <and>
+      <equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
+      <equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
+    </and>
+  </condition>
+  <condition property="linux-bundle-jvm-task" value="bundle">
+    <or>
+      <not>
+        <equals arg1="${LINUX32_BUNDLED_JVM}" arg2="none"/>
+      </not>
+      <not>
+        <equals arg1="${LINUX64_BUNDLED_JVM}" arg2="none"/>
+      </not>
+    </or>
+  </condition>

  <!-- Libraries required for running arduino -->
  <fileset dir=".." id="runtime.jars">
@ -164,6 +182,20 @@
        <exclude name="**/USBHost/**"/>
      </fileset>
    </copy>
+    <antcall target="unzip">
+      <param name="archive_file" value="Firmata-2.4.3.zip" />
+      <param name="archive_url" value="https://github.com/arduino-libraries/Firmata/archive/v2.4.3.zip" />
+      <param name="final_folder" value="${target.path}/libraries/Firmata-2.4.3" />
+      <param name="dest_folder" value="${target.path}/libraries" />
+    </antcall>
+    <move file="${target.path}/libraries/Firmata-2.4.3" tofile="${target.path}/libraries/Firmata" />
+    <antcall target="unzip">
+      <param name="archive_file" value="Temboo-1.1.2.zip" />
+      <param name="archive_url" value="https://github.com/temboo/Temboo/archive/1.1.2.zip" />
+      <param name="final_folder" value="${target.path}/libraries/Temboo-1.1.2" />
+      <param name="dest_folder" value="${target.path}/libraries" />
+    </antcall>
+    <move file="${target.path}/libraries/Temboo-1.1.2" tofile="${target.path}/libraries/Temboo" />
  </target>

  <!-- copy hardware folder -->
@ -641,6 +673,10 @@
  </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}"/>
+    </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"/>
@ -653,6 +689,10 @@
  </target>

  <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
+    <antcall target="linux-jvm-${linux-bundle-jvm-task}">
+      <param name="JVM" value="${LINUX64_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-x86_64-pc-linux-gnu.tar.bz2"/>
@ -683,6 +723,18 @@

  </target>

+  <target name="linux-jvm-noop"/>
+
+  <target name="linux-jvm-bundle">
+    <mkdir dir="${staging_folder}/work/java" />
+
+    <exec executable="rsync">
+      <arg value="-a"/>
+      <arg value="${JVM}"/>
+      <arg value="${staging_folder}/work/java/"/>
+    </exec>
+  </target>
+
  <target name="linux32-run" depends="build" description="Run Linux (32-bit) version">
    <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
  </target>
@ -881,8 +933,8 @@
      <fileset dir="windows/launcher"
 	       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" />
+    <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
+    <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
    <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" />

--- a/build/build_pull_request.bash
+++ b/build/build_pull_request.bash
@ -18,5 +18,5 @@ fi

 VERSION="PR-${ghprbPullId}-BUILD-${BUILD_NUMBER}"

-./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM
+./build_all_dist.bash -Dversion="${VERSION}" -DMACOSX_BUNDLED_JVM=$MACOSX_BUNDLED_JVM -DWINDOWS_BUNDLED_JVM=$WINDOWS_BUNDLED_JVM -DLINUX32_BUNDLED_JVM=$LINUX32_BUNDLED_JVM -DLINUX64_BUNDLED_JVM=$LINUX64_BUNDLED_JVM

--- a/build/cmd/dist.sh
+++ b/build/cmd/dist.sh
@ -26,7 +26,6 @@ cp -r ../shared/lib processing/
 cp -r ../shared/libraries processing/
 cp ../../app/lib/antlr.jar processing/lib/
 cp ../../app/lib/ecj.jar processing/lib/
-cp ../../app/lib/jna.jar processing/lib/
 cp ../shared/revisions.txt processing/

 # add the libraries folder with source
--- a/build/create_reference.pl
+++ b/build/create_reference.pl
@ -16,7 +16,7 @@ my $verbose = 1;
 my $CURL_OPTIONS = "--silent --show-error -u $user:$pass"; 

 my $ARDUINO = 'http://edit.arduino.cc/en_ref'; # base url for reference site
-my $PUBLIC = 'http://arduino.cc/en'; # base url for public site
+my $PUBLIC = 'http://www.arduino.cc/en'; # base url for public site

 my %downloaded = ();  # keep track of the pages we download

--- a/build/fetch.sh
+++ b/build/fetch.sh
@ -13,7 +13,7 @@ cd reference
 perl ../create_reference.pl || die 'unable to create local reference pages'

 mkdir img
-curl http://arduino.cc/en/pub/skins/arduinoUno/img/logo.png > img/logo.png
+curl http://www.arduino.cc/en/pub/skins/arduinoUno/img/logo.png > img/logo.png

 cd ..
 zip -r shared/reference.zip reference || die 'unable to create reference.zip archive'
--- a/build/javadoc/make.sh
+++ b/build/javadoc/make.sh
@ -9,7 +9,7 @@ javadoc -public -notimestamp -d core \
 # setting this up right, so if anyone knows how to do it without specifying
 # all the directories like this, please let us know.
 javadoc -public -notimestamp -d everything \
-    -classpath ../../app/lib/antlr.jar:../../app/lib/jna.jar:../../serial/library/jssc-2.6.0.jar:../../opengl/library/jogl.jar:../../pdf/library/itext.jar:../../app/lib/ecj.jar \
+    -classpath ../../app/lib/antlr.jar:../../serial/library/jssc-2.6.0.jar:../../opengl/library/jogl.jar:../../pdf/library/itext.jar:../../app/lib/ecj.jar \
    ../../core/src/processing/core/*.java \
    ../../core/src/processing/xml/*.java \
    ../../app/src/antlr/*.java \
--- a/build/linux/dist/appdata.xml
+++ b/build/linux/dist/appdata.xml
@ -19,6 +19,6 @@
    <screenshot type="default" width="624" height="351">http://mavit.fedorapeople.org/appdata/arduino-screenshot.png</screenshot>
    <screenshot width="704" height="396">http://mavit.fedorapeople.org/appdata/arduino-photo.jpg</screenshot>
  </screenshots>
-  <url type="homepage">http://arduino.cc/</url>
+  <url type="homepage">http://www.arduino.cc/</url>
  <updatecontact>arduino.appdata.xml@mavit.org.uk</updatecontact>
 </application>
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 CURDIR=`pwd`
 APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
@ -28,5 +28,9 @@ 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 "$@"
+JAVA=java
+if [ -x ./java/bin/java ]; then
+  JAVA=./java/bin/java
+fi

+$JAVA -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir "$CURDIR" "$@"
--- a/build/linux/dist/install.sh
+++ b/build/linux/dist/install.sh
@ -13,5 +13,5 @@ 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 !"
+echo "Installed Arduino IDE icons on menu and desktop !"

--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@ -97,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/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>
+      <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/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>  
--- a/build/shared/examples/01.Basics/Blink/Blink.ino
+++ b/build/shared/examples/01.Basics/Blink/Blink.ino
@ -5,7 +5,7 @@
  Most Arduinos have an on-board LED you can control. On the Uno and
  Leonardo, it is attached to digital pin 13. If you're unsure what
  pin the on-board LED is connected to on your Arduino model, check
-  the documentation at http://arduino.cc
+  the documentation at http://www.arduino.cc

  This example code is in the public domain.

--- a/build/shared/examples/02.Digital/StateChangeDetection/StateChangeDetection.ino
+++ b/build/shared/examples/02.Digital/StateChangeDetection/StateChangeDetection.ino
@ -21,7 +21,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/ButtonStateChange
+ http://www.arduino.cc/en/Tutorial/ButtonStateChange

 */

--- a/build/shared/examples/02.Digital/toneKeyboard/toneKeyboard.ino
+++ b/build/shared/examples/02.Digital/toneKeyboard/toneKeyboard.ino
@ -14,7 +14,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/Tone3
+ http://www.arduino.cc/en/Tutorial/Tone3

 */

--- a/build/shared/examples/02.Digital/toneMelody/toneMelody.ino
+++ b/build/shared/examples/02.Digital/toneMelody/toneMelody.ino
@ -12,7 +12,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/Tone
+ http://www.arduino.cc/en/Tutorial/Tone

 */
 #include "pitches.h"
--- a/build/shared/examples/02.Digital/toneMultiple/toneMultiple.ino
+++ b/build/shared/examples/02.Digital/toneMultiple/toneMultiple.ino
@ -12,7 +12,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/Tone4
+ http://www.arduino.cc/en/Tutorial/Tone4

 */

--- a/build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino
+++ b/build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino
@ -14,7 +14,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/Tone2
+ http://www.arduino.cc/en/Tutorial/Tone2

 */

--- a/build/shared/examples/03.Analog/AnalogInput/AnalogInput.ino
+++ b/build/shared/examples/03.Analog/AnalogInput/AnalogInput.ino
@ -23,7 +23,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/AnalogInput
+ http://www.arduino.cc/en/Tutorial/AnalogInput

 */

--- a/build/shared/examples/03.Analog/Calibration/Calibration.ino
+++ b/build/shared/examples/03.Analog/Calibration/Calibration.ino
@ -20,7 +20,7 @@
 modified 30 Aug 2011
 By Tom Igoe

- http://arduino.cc/en/Tutorial/Calibration
+ http://www.arduino.cc/en/Tutorial/Calibration

 This example code is in the public domain.

--- a/build/shared/examples/03.Analog/Fading/Fading.ino
+++ b/build/shared/examples/03.Analog/Fading/Fading.ino
@ -11,7 +11,7 @@
 modified 30 Aug 2011
 By Tom Igoe

- http://arduino.cc/en/Tutorial/Fading
+ http://www.arduino.cc/en/Tutorial/Fading

 This example code is in the public domain.

--- a/build/shared/examples/04.Communication/SerialEvent/SerialEvent.ino
+++ b/build/shared/examples/04.Communication/SerialEvent/SerialEvent.ino
@ -28,6 +28,7 @@ void setup() {
 }

 void loop() {
+  serialEvent(); //call the function
  // print the string when a newline arrives:
  if (stringComplete) {
    Serial.println(inputString);
--- a/build/shared/examples/05.Control/IfStatementConditional/IfStatementConditional.ino
+++ b/build/shared/examples/05.Control/IfStatementConditional/IfStatementConditional.ino
@ -21,7 +21,7 @@

 This example code is in the public domain.

-http://arduino.cc/en/Tutorial/IfStatement
+http://www.arduino.cc/en/Tutorial/IfStatement

 */

--- a/build/shared/examples/05.Control/WhileStatementConditional/WhileStatementConditional.ino
+++ b/build/shared/examples/05.Control/WhileStatementConditional/WhileStatementConditional.ino
@ -22,7 +22,7 @@

 This example code is in the public domain.

- http://arduino.cc/en/Tutorial/WhileLoop
+ http://www.arduino.cc/en/Tutorial/WhileLoop

 */

--- a/build/shared/examples/08.Strings/StringAdditionOperator/StringAdditionOperator.ino
+++ b/build/shared/examples/08.Strings/StringAdditionOperator/StringAdditionOperator.ino
@ -8,7 +8,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringAdditionOperator
+ http://www.arduino.cc/en/Tutorial/StringAdditionOperator

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringAppendOperator/StringAppendOperator.ino
+++ b/build/shared/examples/08.Strings/StringAppendOperator/StringAppendOperator.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringAppendOperator
+ http://www.arduino.cc/en/Tutorial/StringAppendOperator

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringCaseChanges/StringCaseChanges.ino
+++ b/build/shared/examples/08.Strings/StringCaseChanges/StringCaseChanges.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringCaseChanges
+ http://www.arduino.cc/en/Tutorial/StringCaseChanges

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringCharacters/StringCharacters.ino
+++ b/build/shared/examples/08.Strings/StringCharacters/StringCharacters.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringCharacters
+ http://www.arduino.cc/en/Tutorial/StringCharacters

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringComparisonOperators/StringComparisonOperators.ino
+++ b/build/shared/examples/08.Strings/StringComparisonOperators/StringComparisonOperators.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringComparisonOperators
+ http://www.arduino.cc/en/Tutorial/StringComparisonOperators

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringConstructors/StringConstructors.ino
+++ b/build/shared/examples/08.Strings/StringConstructors/StringConstructors.ino
@ -7,7 +7,7 @@
 modified 30 Aug 2011
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringConstructors
+ http://www.arduino.cc/en/Tutorial/StringConstructors

 This example code is in the public domain.
 */
@ -66,6 +66,14 @@ void loop() {
  // prints "123456" or whatever the value of millis() is:
  Serial.println(stringOne);

+  //using a float and the right decimal places:
+  stringOne = String(5.698, 3);
+  Serial.println(stringOne);
+
+  //using a float and less decimal places to use rounding:
+  stringOne = String(5.698, 2);
+  Serial.println(stringOne);
+
  // do nothing while true:
  while (true);

--- a/build/shared/examples/08.Strings/StringIndexOf/StringIndexOf.ino
+++ b/build/shared/examples/08.Strings/StringIndexOf/StringIndexOf.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringIndexOf
+ http://www.arduino.cc/en/Tutorial/StringIndexOf

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringLength/StringLength.ino
+++ b/build/shared/examples/08.Strings/StringLength/StringLength.ino
@ -7,7 +7,7 @@
 created 1 Aug 2010
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringLengthTrim
+ http://www.arduino.cc/en/Tutorial/StringLengthTrim

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringLengthTrim/StringLengthTrim.ino
+++ b/build/shared/examples/08.Strings/StringLengthTrim/StringLengthTrim.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringLengthTrim
+ http://www.arduino.cc/en/Tutorial/StringLengthTrim

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringReplace/StringReplace.ino
+++ b/build/shared/examples/08.Strings/StringReplace/StringReplace.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringReplace
+ http://www.arduino.cc/en/Tutorial/StringReplace

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringStartsWithEndsWith/StringStartsWithEndsWith.ino
+++ b/build/shared/examples/08.Strings/StringStartsWithEndsWith/StringStartsWithEndsWith.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Tom Igoe

- http://arduino.cc/en/Tutorial/StringStartsWithEndsWith
+ http://www.arduino.cc/en/Tutorial/StringStartsWithEndsWith

 This example code is in the public domain.
 */
--- a/build/shared/examples/08.Strings/StringSubstring/StringSubstring.ino
+++ b/build/shared/examples/08.Strings/StringSubstring/StringSubstring.ino
@ -7,7 +7,7 @@
 modified 2 Apr 2012
 by Zach Eveland

- http://arduino.cc/en/Tutorial/StringSubstring
+ http://www.arduino.cc/en/Tutorial/StringSubstring

 This example code is in the public domain.
 */
--- a/build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
+++ b/build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
@ -15,7 +15,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p03_LoveOMeter/p03_LoveOMeter.ino
+++ b/build/shared/examples/10.StarterKit/p03_LoveOMeter/p03_LoveOMeter.ino
@ -13,7 +13,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
@ -60,7 +60,7 @@ void loop() {

  // if the current temperature is lower than the baseline
  // turn off all LEDs
-  if (temperature < baselineTemp) {
+  if (temperature < baselineTemp + 2) {
    digitalWrite(2, LOW);
    digitalWrite(3, LOW);
    digitalWrite(4, LOW);
--- a/build/shared/examples/10.StarterKit/p04_ColorMixingLamp/p04_ColorMixingLamp.ino
+++ b/build/shared/examples/10.StarterKit/p04_ColorMixingLamp/p04_ColorMixingLamp.ino
@ -17,7 +17,7 @@
 by Scott Fitzgerald
 Thanks to Federico Vanzati for improvements

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p05_ServoMoodIndicator/p05_ServoMoodIndicator.ino
+++ b/build/shared/examples/10.StarterKit/p05_ServoMoodIndicator/p05_ServoMoodIndicator.ino
@ -13,7 +13,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p06_LightTheremin/p06_LightTheremin.ino
+++ b/build/shared/examples/10.StarterKit/p06_LightTheremin/p06_LightTheremin.ino
@ -13,7 +13,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p07_Keyboard/p07_Keyboard.ino
+++ b/build/shared/examples/10.StarterKit/p07_Keyboard/p07_Keyboard.ino
@ -15,7 +15,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p08_DigitalHourglass/p08_DigitalHourglass.ino
+++ b/build/shared/examples/10.StarterKit/p08_DigitalHourglass/p08_DigitalHourglass.ino
@ -14,7 +14,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p09_MotorizedPinwheel/p09_MotorizedPinwheel.ino
+++ b/build/shared/examples/10.StarterKit/p09_MotorizedPinwheel/p09_MotorizedPinwheel.ino
@ -16,7 +16,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p10_Zoetrope/p10_Zoetrope.ino
+++ b/build/shared/examples/10.StarterKit/p10_Zoetrope/p10_Zoetrope.ino
@ -17,7 +17,7 @@
 by Scott Fitzgerald
 Thanks to Federico Vanzati for improvements

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p11_CrystalBall/p11_CrystalBall.ino
+++ b/build/shared/examples/10.StarterKit/p11_CrystalBall/p11_CrystalBall.ino
@ -16,7 +16,7 @@
 Created 13 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p12_KnockLock/p12_KnockLock.ino
+++ b/build/shared/examples/10.StarterKit/p12_KnockLock/p12_KnockLock.ino
@ -21,7 +21,7 @@
 by Scott Fitzgerald
 Thanks to Federico Vanzati for improvements

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
@ -140,6 +140,8 @@ void loop() {
      digitalWrite(greenLed, HIGH);
      digitalWrite(redLed, LOW);
      Serial.println("the box is unlocked!");
+
+      numberOfKnocks = 0;
    }
  }
 }
--- a/build/shared/examples/10.StarterKit/p13_TouchSensorLamp/p13_TouchSensorLamp.ino
+++ b/build/shared/examples/10.StarterKit/p13_TouchSensorLamp/p13_TouchSensorLamp.ino
@ -13,12 +13,12 @@

 Software required :
 CapacitiveSensor library by Paul Badger
- http://arduino.cc/playground/Main/CapacitiveSensor
+ http://www.arduino.cc/playground/Main/CapacitiveSensor

 Created 18 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/examples/10.StarterKit/p14_TweakTheArduinoLogo/p14_TweakTheArduinoLogo.ino
+++ b/build/shared/examples/10.StarterKit/p14_TweakTheArduinoLogo/p14_TweakTheArduinoLogo.ino
@ -15,7 +15,7 @@
 Created 18 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
@ -55,7 +55,7 @@ void loop() {
 colorMode(HSB, 255);

 // load the Arduino logo into the PImage instance
- logo = loadImage("http://arduino.cc/en/pub/skins/arduinoWide/img/logo.png");
+ logo = loadImage("http://www.arduino.cc/en/pub/skins/arduinoWide/img/logo.png");

 // make the window the same size as the image
 size(logo.width, logo.height);
--- a/build/shared/examples/10.StarterKit/p15_HackingButtons/p15_HackingButtons.ino
+++ b/build/shared/examples/10.StarterKit/p15_HackingButtons/p15_HackingButtons.ino
@ -13,7 +13,7 @@
 Created 18 September 2012
 by Scott Fitzgerald

- http://arduino.cc/starterKit
+ http://www.arduino.cc/starterKit

 This example code is part of the public domain
 */
--- a/build/shared/lib/keywords.txt
+++ b/build/shared/lib/keywords.txt
@ -67,6 +67,7 @@ public	LITERAL2		RESERVED_WORD_2
 short	LITERAL2		RESERVED_WORD_2
 signed	LITERAL2		RESERVED_WORD_2
 static	LITERAL2	Static	RESERVED_WORD_2
+goto	LITERAL2		RESERVED_WORD_2
 String	LITERAL2	String	RESERVED_WORD_2
 void	LITERAL2	Void	RESERVED_WORD_2
 true	LITERAL2		LITERAL_BOOLEAN
--- a/build/shared/lib/theme/theme.txt
+++ b/build/shared/lib/theme/theme.txt
@ -97,10 +97,11 @@ editor.literal1.style = #006699,plain
 editor.literal2.style = #00979C,plain
 editor.variable.style = #00979C,plain
 editor.reserved_word_2.style = #00979C,plain
+editor.literal_boolean.style = #00979C,plain
 editor.literal_char.style = #00979C,plain
 editor.literal_string_double_quote.style = #00979C,plain

-# http://arduino.cc/
+# http://www.arduino.cc/
 editor.url.style = #0000ff,underlined

 # e.g. + - = /
--- a/build/shared/manpage.adoc
+++ b/build/shared/manpage.adoc
@ -27,7 +27,7 @@ SYNOPSIS

 *arduino* [*--verify*|*--upload*] [*--board* __package__:__arch__:__board__[:__parameters__]] [*--port* __portname__] [*--pref* __name__=__value__] [*-v*|*--verbose*] [--preserve-temp-files] [__FILE.ino__]

-*arduino* [*--get-pref* __preference__]
+*arduino* [*--get-pref* [__preference__]]

 *arduino* [*--install-boards* __package name__:__platform architecture__[:__version__]]

@ -63,10 +63,11 @@ ACTIONS
 *--upload*::
 	Build and upload the sketch.

-*--get-pref* __preference__::
+*--get-pref* [__preference__]::
 	Prints the value of the given preference to the standard output
 	stream. When the value does not exist, nothing is printed and
 	the exit status is set (see EXIT STATUS below).
+	If no preference is given as parameter, it prints all preferences.

 *--install-boards* __package name__:__platform architecture__[:__version__]::
 	Fetches available board support (platform) list and install the specified one, along with its related tools. If __version__ is omitted, the latest is installed. If a platform with the same version is already installed, nothing is installed and program exits with exit code 1. If a platform with a different version is already installed, it's replaced.
@ -333,7 +334,7 @@ HISTORY

 RESOURCES
 ---------
-Web site: <http://arduino.cc/>
+Web site: <http://www.arduino.cc/>

 Help on projects and programming: <http://forum.arduino.cc/>

--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@ -1,4 +1,11 @@
-ARDUINO 1.6.5
+ARDUINO 1.6.6
+
+ARDUINO 1.6.5-r2 - 2015.06.17
+
+[ide]
+* Windows: fixed a problem that prevented opening the IDE when double clicking a .ino file
+
+ARDUINO 1.6.5 - 2015.06.15

 [ide]
 * File, Sketch and Tools menu items are properly handled when switching between different windows
@ -6,12 +13,41 @@ ARDUINO 1.6.5
 * New editor, based on RSyntaxTextArea. Thanks @ricardojlrufino
 * New keywords. Thanks @Chris--A
 * Easier "additional boards manager url" field: a wide text area opens by clicking the added button (right side of the text field)
+* Rewritten code of Preferences window: its content is now correctly drawn on every OS
+* Fixed a bug that made the IDE notify users of invalid libraries too many times. Thanks @Chris--A
+* Removed JNA. Less native stuff and less chances of incurring into an UnsatisfiedLinkError
+* Many new and old issues closed. Thanks to many, and @Chris--A in particular
+* Faster libraries list update
+* Serial monitor stays opened during upload, disabled. Thanks @avishorp and @Wackerbarth
+* CLI: --get-pref can now be called without a pref name. If pref name is missing, IDE dumps all preferences
+* Holding SHIFT when hovering the save icon will trigger a "Save As"
+* Removed proxy settings from File > Preferences: IDE will use system settings
+* Linux versions bundle the latest JVM, 1.8.0_45
+* Local docs: if your sketch has a "docs" folder, you can add local links to it. For example file://./docs/index.html
+  will use your browser to open file index.html from the "docs" folder of your sketch
+* When using "external editor" mode, sketch code is updated when the IDE gets focused
+* Added keyboard shortcuts to IDE menus: ALT+F for File, ALT+E for Edit and so on
+* Added support for Dangerous Prototypes Bus Pirate as ISP
+* Added "Close" button to Boards/Libs Managers, in order to help linux people with weird Window Managers
+* Added File > Open Recent menu, showing the last 5 opened sketches
+* Windows: added Arduino Zero drivers
+* Tons of minor fixes

 [libraries]
 * LiquidCrystal fixes. Thanks @newbie15
+* Added SPI Transactions to TFT lib
+* Stepper: support for 5-phase/5-wires motors. Thanks @rdodesigns
+* Stepper: increased precision in timing calculations. Thanks @ekozlenko
+* Firmata and Temboo: dropped our vesions, tagged released are downloaded from their respective git repos

 [core]
-* SAM: added watchdog routing for Due. Thanks @bobc
+* AVR: delayMicroseconds(..) doesn't hang if called with 0. Thanks @cano64
+* AVR: delayMicroseconds(..), added support for 1Mhz, 12Mhz and 24Mhz. Thanks @cano64
+* AVR: added missing case in detachInterrupt(). Thanks @leres, @vicatcu
+* SAM: added watchdog routine for Due. Thanks @bobc
+* AVR+SAM: reworked pulseIn() function to become GCC agnostic
+* AVR+SAM: added pulseInLong() (based on micros()) to help getting good results in interrupt-prone environments
+* AVR: fixed regression in HardwareSerial.flush(). Thanks @chromhelm

 ARDUINO 1.6.4 - 2015.05.06

@ -63,6 +99,7 @@ ARDUINO 1.6.2 - 2015.03.28
 * Introduced starting splashscreen with progress status: will be used for notifying user of long running startup tasks
 * Available ports list is now generated in background: hence "tools" menu is much faster
 * MacOSX: appbundler merged our contribution, switching to upstream version https://bitbucket.org/infinitekind/appbundler/
+* MacOSX: filtering /dev/cu* was not a good idea. Filtering /dev/tty* instead

 [core]
 * Stream: fixed bug in findUntil routine #2591 @Xuth
@ -493,7 +530,7 @@ ARDUINO 1.5 BETA - 2012.10.22
 * Everything is in beta, most features or libraries are still  missing 
  or incomplete.
 * For more info refer to this press release:
-  http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/
+  http://www.arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/

 ARDUINO 1.0.7

@ -725,7 +762,7 @@ ARDUINO 1.0.1 - 2012.05.21
 * The IDE has been internationalized and translated into multiple languages.
  Thanks to Shigeru Kanemoto for the internationalization and Japanese
  translation and many others for the other translations.  For more
-  information, see: http://arduino.cc/playground/Main/LanguagesIDE
+  information, see: http://www.arduino.cc/playground/Main/LanguagesIDE

 * Added preference for selecting the language in which to display the
  Arduino software.  Defaults to the operating system locale.  
@ -980,7 +1017,7 @@ ARDUINO 0022 - 2010.12.24

 * Adding an SD card library based on sdfatlib by Bill Greiman and the
  MemoryCard library by Philip Lindsay (follower) for SparkFun.
-  http://arduino.cc/en/Reference/SD
+  http://www.arduino.cc/en/Reference/SD

 * Added character manipulation macros (from Wiring): isAlphaNumeric(),
  isAlpha(), isAscii(), isWhitespace(), isControl(), isDigit(), isGraph(),
--- a/build/windows/dist/drivers/arduino.cat
+++ b/build/windows/dist/drivers/arduino.cat
--- a/build/windows/dist/drivers/arduino.inf
+++ b/build/windows/dist/drivers/arduino.inf
@ -1,10 +1,37 @@
-; Copyright 2012 Blacklabel Development, Inc.
+;
+; Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+;
+; Developed by Zach Eveland, Blacklabel Development, Inc.
+;
+; Arduino is free software; you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation; either version 2 of the License, or
+; (at your option) any later version.
+;
+; This program is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program; if not, write to the Free Software
+; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+;
+; As a special exception, you may use this file as part of a free software
+; library without restriction.  Specifically, if other files instantiate
+; templates or use macros or inline functions from this file, or you compile
+; this file and link it with other files to produce an executable, this
+; file does not by itself cause the resulting executable to be covered by
+; the GNU General Public License.  This exception does not however
+; invalidate any other reasons why the executable file might be covered by
+; the GNU General Public License.
+;

 [Strings]
 DriverPackageDisplayName="Arduino USB Driver"
 ManufacturerName="Arduino LLC (www.arduino.cc)"
 ServiceName="USB RS-232 Emulation Driver"
-due.bossa.name="Bossa Program Port"
+bossa.name="Bossa Program Port"
 due.programming_port.name="Arduino Due Programming Port"
 due.sketch.name="Arduino Due"
 esplora.bootloader.name="Arduino Esplora bootloader"
@ -19,15 +46,20 @@ megaADK.name="Arduino Mega ADK"
 megaADKrev3.name="Arduino Mega ADK"
 micro.bootloader.name="Arduino Micro bootloader"
 micro.sketch.name="Arduino Micro"
-uno.name="Arduino Uno"
-unoR3.name="Arduino Uno"
-usbserial.name="Arduino USB Serial Light Adapter"
 robotControl.bootloader.name="Arduino Robot Control bootloader"
 robotControl.sketch.name="Arduino Robot"
 robotMotor.bootloader.name="Arduino Robot Motor bootloader"
 robotMotor.sketch.name="Arduino Robot"
+uno.name="Arduino Uno"
+unoR3.name="Arduino Uno"
+usbserial.name="Arduino USB Serial Light Adapter"
 yun.bootloader.name="Arduino Yun bootloader"
 yun.sketch.name="Arduino Yun"
+zero.edbg.name="Atmel Corp. EDBG CMSIS-DAP"
+zero.sketch.name="Arduino Zero"
+zero.bootloader.name="Arduino Zero bootloader"
+sme_fox.sketch.name="SmartEverything Fox"
+sme_fox.bootloader.name="SmartEverything Fox bootloader"

 [DefaultInstall]
 CopyINF=arduino.inf
@ -39,7 +71,7 @@ Signature="$Windows NT$"
 Provider=%ManufacturerName%
 DriverPackageDisplayName=%DriverPackageDisplayName%
 CatalogFile=arduino.cat
-DriverVer=01/04/2013,1.0.0.0
+DriverVer=06/15/2015,1.2.2.0

 [Manufacturer]
 %ManufacturerName%=DeviceList, NTamd64, NTia64
@ -49,7 +81,7 @@ FakeModemCopyFileSection=12
 DefaultDestDir=12

 [DeviceList]
-%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
+%bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
 %due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D
 %due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00
 %esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
@ -64,18 +96,23 @@ DefaultDestDir=12
 %megaADKrev3.name%=DriverInstall, USB\VID_2341&PID_0044
 %micro.bootloader.name%=DriverInstall, USB\VID_2341&PID_0037
 %micro.sketch.name%=DriverInstall, USB\VID_2341&PID_8037&MI_00
-%uno.name%=DriverInstall, USB\VID_2341&PID_0001
-%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
-%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
 %robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
 %robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
+%uno.name%=DriverInstall, USB\VID_2341&PID_0001
+%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
+%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
 %yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
+%zero.edbg.name%=DriverInstall, USB\VID_03EB&PID_2157&MI_01
+%zero.sketch.name%=DriverInstall, USB\VID_2341&PID_804D&MI_00
+%zero.bootloader.name%=DriverInstall, USB\VID_2341&PID_004D
+%sme_fox.sketch.name%=DriverInstall, USB\VID_2341&PID_E002&MI_00
+%sme_fox.bootloader.name%=DriverInstall, USB\VID_2341&PID_E001

 [DeviceList.NTamd64]
-%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
+%bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
 %due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D
 %due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00
 %esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
@ -99,8 +136,16 @@ DefaultDestDir=12
 %robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
 %yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
 %yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
+%zero.edbg.name%=DriverInstall, USB\VID_03EB&PID_2157&MI_01
+%zero.sketch.name%=DriverInstall, USB\VID_2341&PID_804D&MI_00
+%zero.bootloader.name%=DriverInstall, USB\VID_2341&PID_004D
+%sme_fox.sketch.name%=DriverInstall, USB\VID_2341&PID_E002&MI_00
+%sme_fox.bootloader.name%=DriverInstall, USB\VID_2341&PID_E001

 [DeviceList.NTia64]
+%bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
+%due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D
+%due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00
 %esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
 %esplora.sketch.name%=DriverInstall, USB\VID_2341&PID_803C&MI_00
 %leonardo.bootloader.name%=DriverInstall, USB\VID_2341&PID_0036
@ -122,6 +167,11 @@ DefaultDestDir=12
 %robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
 %yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
 %yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
+%zero.edbg.name%=DriverInstall, USB\VID_03EB&PID_2157&MI_01
+%zero.sketch.name%=DriverInstall, USB\VID_2341&PID_804D&MI_00
+%zero.bootloader.name%=DriverInstall, USB\VID_2341&PID_004D
+%sme_fox.sketch.name%=DriverInstall, USB\VID_2341&PID_E002&MI_00
+%sme_fox.bootloader.name%=DriverInstall, USB\VID_2341&PID_E001

 [DriverInstall]
 include=mdmcpq.inf,usb.inf
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@ -3,15 +3,9 @@
  <headerType>gui</headerType>
  <jar>lib</jar>
  <outfile>arduino.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
  <chdir>.</chdir>
-  <priority>normal</priority>
-  <downloadUrl>http://java.sun.com/javase/downloads/</downloadUrl>
-  <supportUrl></supportUrl>
-  <customProcName>false</customProcName>
-  <stayAlive>false</stayAlive>
-  <manifest></manifest>
+  <errTitle>Arduino</errTitle>
+  <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
  <icon>application.ico</icon>
  <classPath>
    <mainClass>processing.app.Base</mainClass>
@ -34,7 +28,6 @@
    <cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
    <cp>lib/java-semver-0.8.0.jar</cp>
    <cp>lib/jmdns-3.4.1.jar</cp>
-    <cp>lib/jna.jar</cp>
    <cp>lib/jsch-0.1.50.jar</cp>
    <cp>lib/jssc-2.8.0.jar</cp>
    <cp>lib/pde.jar</cp>
@ -46,6 +39,14 @@
    <opt>-splash:./lib/splash.png</opt>
    <opt>-Dsun.java2d.d3d=false</opt>
  </jre>
+  <versionInfo>
+    <fileDescription>Arduino IDE</fileDescription>
+    <copyright>Arduino LLC</copyright>
+    <productName>Arduino</productName>
+    <companyName>Arduino LLC</companyName>
+    <internalName>arduino</internalName>
+    <originalFilename>arduino.exe</originalFilename>
+  </versionInfo>
  <messages>
    <startupErr>An error occurred while starting the application.</startupErr>
    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@ -3,15 +3,9 @@
  <headerType>console</headerType>
  <jar>lib</jar>
  <outfile>arduino_debug.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
  <chdir>.</chdir>
-  <priority>normal</priority>
-  <downloadUrl>http://java.sun.com/javase/downloads/</downloadUrl>
-  <supportUrl></supportUrl>
-  <customProcName>false</customProcName>
-  <stayAlive>false</stayAlive>
-  <manifest></manifest>
+  <errTitle>Arduino</errTitle>
+  <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
  <icon>application.ico</icon>
  <classPath>
    <mainClass>processing.app.Base</mainClass>
@ -34,7 +28,6 @@
    <cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
    <cp>lib/java-semver-0.8.0.jar</cp>
    <cp>lib/jmdns-3.4.1.jar</cp>
-    <cp>lib/jna.jar</cp>
    <cp>lib/jsch-0.1.50.jar</cp>
    <cp>lib/jssc-2.8.0.jar</cp>
    <cp>lib/pde.jar</cp>
@ -45,6 +38,14 @@
    <runtimeBits>32</runtimeBits>
    <opt>-Dsun.java2d.d3d=false</opt>
  </jre>
+  <versionInfo>
+    <fileDescription>Arduino IDE</fileDescription>
+    <copyright>Arduino LLC</copyright>
+    <productName>Arduino</productName>
+    <companyName>Arduino LLC</companyName>
+    <internalName>arduino</internalName>
+    <originalFilename>arduino.exe</originalFilename>
+  </versionInfo>
  <messages>
    <startupErr>An error occurred while starting the application.</startupErr>
    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>