Catch up to Arduio and Alvie's changes

.classpath

@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
+	<classpathentry kind="src" path="app/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="app/lib/antlr.jar"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
 	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
 	<classpathentry kind="lib" path="app/lib/jna.jar"/>
-	<classpathentry kind="lib" path="app/lib/RXTXcomm.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar" sourcepath="/home/megabug/git/fest-swing-1.2-sources.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
+	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="output" path="app/bin"/>
 </classpath>

.gitignore

@@ -14,12 +14,30 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
 build/windows/work/
+build/windows/jre.zip
+build/windows/libastylej*
 build/windows/arduino-*.zip
 build/windows/dist/gcc-*.tar.gz
+build/windows/launch4j-*
+build/windows/launcher/launch4j
+build/windows/WinAVR-*.zip
 build/macosx/arduino-*.zip
 build/macosx/dist/gcc-*.tar.gz
+build/macosx/libastylej*
+build/macosx/appbundler*.jar
 build/linux/work/
 build/linux/dist/*.tar.gz
+build/linux/dist/*.tar.bz2
 build/linux/*.tgz
+build/linux/*.zip
+build/linux/libastylej*
 test-bin
 *.iml
+*~
+.idea
+.DS_Store
+build/windows/launch4j-*
+build/windows/launcher/launch4j
+build/windows/WinAVR-*.zip
+hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
+avr-toolchain-*.zip

README.md

@@ -0,0 +1,44 @@
+Arduino
+========
+
+* Arduino is an open-source physical computing platform based on a simple i/o
+board and a development environment that implements the Processing/Wiring
+language. Arduino can be used to develop stand-alone interactive objects or
+can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
+The boards can be assembled by hand or purchased preassembled; the open-source
+IDE can be downloaded for free.
+
+* For more information, see the website at: http://www.arduino.cc/
+or the forums at: http://arduino.cc/forum/
+
+* To report a *bug* in the software or to request *a simple enhancement* go to:
+http://github.com/arduino/Arduino/issues
+
+* More complex requests and technical discussion should go on the Arduino Developers
+mailing list:
+https://groups.google.com/a/arduino.cc/forum/#!forum/developers
+
+* If you're interested in modifying or extending the Arduino software, we strongly 
+suggest discussing your ideas on the Developers mailing list *before* starting
+to work on them. That way you can coordinate with the Arduino Team and others,
+giving your work a higher chance of being integrated into the official release
+https://groups.google.com/a/arduino.cc/forum/#!forum/developers
+
+Installation
+------------
+Detailed instructions are in reference/Guide_Windows.html and
+reference/Guide_MacOSX.html.  For Linux, see the Arduino playground:
+http://www.arduino.cc/playground/Learning/Linux
+
+Credits
+--------
+Arduino is an open source project, supported by many.
+
+The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
+Gianluca Martino, Daniela Antonietti, and David A. Mellis.
+
+Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
+[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
+
+Icon and about image designed by [ToDo](http://www.todo.to.it/)
+

app/.classpath

@@ -7,6 +7,12 @@
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
-	<classpathentry kind="lib" path="lib/RXTXcomm.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
+	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/build.xml

@@ -1,6 +1,22 @@
 <?xml version="1.0"?>
 <project name="Arduino PDE" default="build">
 
+  <path id="class.path">
+    <fileset dir="lib">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
+    <pathelement path="../core/core.jar"/>
+  </path>
+
+  <path id="class.path.test">
+    <path refid="class.path"/>
+    <pathelement location="bin/"/>
+    <fileset dir="test-lib">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete dir="test-bin" />
@@ -32,19 +48,47 @@
     <fail if="windows" unless="java_home"
 	  message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_18." />
 
+    <condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/">
+      <os family="mac"/>
+    </condition>
+    <condition property="java.additional.library.path" value=".">
+      <os family="mac"/>
+    </condition>
+    <condition property="java.additional.jvmargs" value="-d32">
+      <os family="mac"/>
+    </condition>
+    <condition property="work.dir" value="../build/windows/work/">
+      <os family="windows"/>
+    </condition>
+    <condition property="java.additional.library.path" value=".">
+      <os family="windows"/>
+    </condition>
+    <condition property="java.additional.jvmargs" value="-Ddummy=0">
+      <os family="windows"/>
+    </condition>
+    <condition property="work.dir" value="../build/linux/work/">
+      <os family="unix"/>
+    </condition>
+    <condition property="java.additional.library.path" value="lib">
+      <os family="unix"/>
+    </condition>
+    <condition property="java.additional.jvmargs" value="-Ddummy=0">
+      <os family="unix"/>
+    </condition>
+
 <!--
     <dirname property="blah" file="${java.home}" />
     <echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
     <echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
     <fail />
 -->
-    <javac source="1.5" target="1.5"
+    <javac source="1.6" target="1.6"
 	   srcdir="src"
 	   destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   debug="true"
-	   classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
+	   classpathref="class.path" />
     <copy todir="bin" overwrite="true" verbose="true">
       <fileset dir="src" includes="**/*.properties" />
     </copy>
@@ -53,54 +97,45 @@
   <target name="test" depends="compile" description="Runs the test">
     <mkdir dir="test-bin"/>
 
-    <javac source="1.5" target="1.5"
+    <javac source="1.6" target="1.6"
            srcdir="test"
            destdir="test-bin"
            encoding="UTF-8"
            includeAntRuntime="false"
-           debug="true">
-      <classpath>
-        <pathelement location="bin"/>
-        <pathelement location="../core/core.jar"/>
-        <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
-        <pathelement location="lib/apple.jar"/>
-        <pathelement location="lib/ecj.jar"/>
-        <pathelement location="lib/jna.jar"/>
-        <pathelement location="lib/RXTXcomm.jar"/>
-        <pathelement location="test-lib/junit-4.11.jar"/>
-      </classpath>
+           debug="true"
+           classpathref="class.path.test">
     </javac>
 
     <copy todir="test-bin" overwrite="true" verbose="true">
       <fileset dir="test" includes="**/*.zip" />
       <fileset dir="test" includes="**/*.txt" />
+      <fileset dir="test" includes="**/*.properties" />
+      <fileset dir="test" includes="**/*.ino" />
     </copy>
 
-    <junit printsummary="yes">
+    <junit printsummary="yes" dir="${work.dir}" fork="true">
+      <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
+      <jvmarg value="${java.additional.jvmargs}"/>
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>
-        <pathelement location="../core/core.jar"/>
-        <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
-        <pathelement location="lib/apple.jar"/>
-        <pathelement location="lib/ecj.jar"/>
-        <pathelement location="lib/jna.jar"/>
-        <pathelement location="lib/RXTXcomm.jar"/>
-        <pathelement location="test-lib/junit-4.11.jar"/>
+        <pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
+        <path refid="class.path.test"/>
       </classpath>
 
       <formatter type="xml"/>
 
       <batchtest fork="yes" todir="test-bin">
         <fileset dir="test">
           <include name="**/*Test.java"/>
+          <exclude name="**/Abstract*.java"/>
         </fileset>
       </batchtest>
     </junit>
 
   </target>
 
-  <target name="build" depends="test" description="Build PDE">
+  <target name="build" depends="compile" description="Build PDE">
     <jar basedir="bin" destfile="pde.jar" />
   </target>
 </project>

app/lib/apple.LICENSE.BSD-like.txt

@@ -0,0 +1 @@
+http://developer.apple.com/library/mac/#/legacy/library/samplecode/AppleJavaExtensions/Listings/README_txt.html#//apple_ref/doc/uid/DTS10000677-README_txt-DontLinkElementID_3