Merge branch 'ide-1.5.x-gui-refactor' into ide-1.5.x

build/build.xml

@@ -39,7 +39,7 @@
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
-    <include name="core/core.jar" />
+    <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" />
@@ -84,12 +84,12 @@
   <!-- - - - - - - - - - - - - - - - - - -->
 
   <target name="subprojects-clean">
-    <subant buildpath="../core" target="clean"/>
+    <subant buildpath="../arduino-core" target="clean"/>
     <subant buildpath="../app" target="clean"/>
   </target>
 
   <target name="subprojects-build">
-    <subant buildpath="../core" target="build"/>
+    <subant buildpath="../arduino-core" target="build"/>
     <subant buildpath="../app" target="build"/>
   </target>
 
@@ -163,7 +163,7 @@
     <echo message="Latest revision detected in shared/revision.txt is: ${revision}" />
 
     <!-- figure out the revision number in base.java -->
-    <loadfile srcfile="../app/src/processing/app/Base.java"
+    <loadfile srcfile="../arduino-core/src/processing/app/BaseNoGui.java"
 	      property="revision.base">
       <filterchain>
         <tokenfilter>
@@ -173,7 +173,7 @@
         </tokenfilter>
       </filterchain>
     </loadfile>
-    <echo message="Revision in Base.java is: ${revision.base}" />
+    <echo message="Revision in BaseNoGui.java is: ${revision.base}" />
   </target>
 
   <!-- - - - - - - - -->

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

@@ -94,7 +94,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/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/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>
 
       <key>JVMArchs</key>  
       <array>  

build/shared/revisions.txt

@@ -1,5 +1,11 @@
 
-ARDUINO 1.5.9
+ARDUINO 1.6.0rc1
+
+* IDE internals have been refactored and sorted out. (Claudio Indellicati)
+  https://github.com/arduino/Arduino/pull/2328
+  The builder and the GUI now have clearly separated source code making it easier
+  for IDE developers to maintain and propose patch.
+  From a user point of view nothing changes and the IDE should behave exactly as before.
 
 [ide]
 * Autosave on sketch Upload/Verify (Fulvio Ieva)
@@ -7,7 +13,8 @@ ARDUINO 1.5.9
 * Sketch build process: core.a rebuild only if needed (Matthijs Kooijman)
 * Updated AStyle formatter to v2.04: http://astyle.sourceforge.net/notes.html
 * Improved avrdude verbose upload (Matthijs Kooijman)
-* (Mac OSX) Add Exported UTI for ino files, allows quick look to view the content of the file and external editors to syntax highlight as C++ (Matt Lloyd)
+* (Mac OSX) Add Exported UTI for ino files, allows quick look to view the
+  content of the file and external editors to syntax highlight as C++ (Matt Lloyd)
 
 [core]
 * sam: added -MMD flag to let gcc produce dependency files (full rebuild on Arduino Due is now triggered only if needed)

build/windows/launcher/config.xml

@@ -16,7 +16,6 @@
   <classPath>
     <mainClass>processing.app.Base</mainClass>
     <cp>lib/pde.jar</cp>
-    <cp>lib/core.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/ecj.jar</cp>
     <cp>lib/jssc-2.8.0.jar</cp>

build/windows/launcher/config_debug.xml

@@ -16,7 +16,6 @@
   <classPath>
     <mainClass>processing.app.Base</mainClass>
     <cp>lib/pde.jar</cp>
-    <cp>lib/core.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/ecj.jar</cp>
     <cp>lib/jssc-2.8.0.jar</cp>