From c4d14f8086230103d41a2ac210c6c309cd66cde0 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 13 Mar 2015 12:31:01 +0100
Subject: [PATCH] Fixed missing jar in classpath

---
 build/build.xml                               | 1 +
 build/macosx/template.app/Contents/Info.plist | 2 +-
 build/windows/launcher/config.xml             | 1 +
 build/windows/launcher/config_debug.xml       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index be3163983..a3b1bb624 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -51,6 +51,7 @@
     <include name="arduino-core/arduino-core.jar" />
     <include name="app/pde.jar" />
     <include name="app/lib/*.jar" />
+    <include name="arduino-core/lib/*.jar" />
   </fileset>
 
   <target name="build" description="Build Arduino.">
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index 72287cf50..e48146869 100755
--- 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/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/bcpg-jdk15on-149.jar:$JAVAROOT/bcprov-jdk15on-149.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.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/jmdns-3.4.1.jar:$JAVAROOT/jna.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar</string>
+      <string>$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/bcpg-jdk15on-149.jar:$JAVAROOT/bcprov-jdk15on-149.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</string>
 
       <key>JVMArchs</key>  
       <array>  
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index ca92b954f..30521fe94 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -32,6 +32,7 @@
     <cp>lib/jackson-core-2.2.3.jar</cp>
     <cp>lib/jackson-databind-2.2.3.jar</cp>
     <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>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 31ccbe1d4..9731811f6 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -32,6 +32,7 @@
     <cp>lib/jackson-core-2.2.3.jar</cp>
     <cp>lib/jackson-databind-2.2.3.jar</cp>
     <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>