arduino-core project is now correctly compiled through ant build script

Author: cmaglie

.gitignore

@@ -1,8 +1,8 @@
 app/bin/
 app/pde.jar
 build/macosx/work/
-core/bin/
-core/core.jar
+arduino-core/bin/
+arduino-core/arduino-core.jar
 hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
 hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym

app/build.xml

@@ -6,7 +6,7 @@
       <include name="*.jar"/>
     </fileset>
     <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
-    <pathelement path="../core/core.jar"/>
+    <pathelement path="../arduino-core/arduino-core.jar"/>
   </path>
 
   <path id="class.path.test">
@@ -25,9 +25,9 @@
 
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../arduino-core/arduino-core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the Arduino-core library first and make sure it sits in ../arduino-core/arduino-core.jar" />
 
     <mkdir dir="bin" />
 
@@ -89,9 +89,6 @@
 	   includeAntRuntime="false"
 	   debug="true"
 	   classpathref="class.path" />
-    <copy todir="bin" overwrite="true" verbose="true">
-      <fileset dir="src" includes="**/*.properties" />
-    </copy>
   </target>
 
   <target name="test" depends="compile" description="Runs the test">

arduino-core/build.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<project name="Arduino IDE Core" default="build">
+
+  <path id="class.path">
+    <fileset dir="lib">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
+  </path>
+
+  <target name="clean" description="Clean out the build directories">
+    <delete dir="bin" />
+    <delete file="arudino-core.jar" />
+  </target>
+
+  <target name="compile" description="Compile">
+<!--
+    <taskdef name="methods"
+             classname="PAppletMethods"
+             classpath="methods/methods.jar" />
+    <methods dir="${basedir}/src/processing/core" />
+-->
+    <mkdir dir="bin" />
+
+    <!-- ant seems to nuke ${java.home} for some reason, pointing at the JRE
+	 subfolder instead of the actual JDK found at JAVA_HOME. 
+	 To avoid this, we grab the actual JAVA_HOME environment variable 
+	 and use that to specify the location of tools.jar. -->
+
+    <!-- if someone is better with ant please help clean this up -->
+    <property environment="env" />
+    <property name="java_home" value="${env.JAVA_HOME}" />
+
+    <javac source="1.6"
+           target="1.6"
+           encoding="UTF-8"
+           includeAntRuntime="false"
+           srcdir="src"
+           classpathref="class.path"
+           destdir="bin">
+    </javac>
+
+    <copy todir="bin" overwrite="true" verbose="true">
+      <fileset dir="src" includes="**/*.properties" />
+    </copy>
+  </target>
+
+  <target name="build" depends="compile" description="Build core library">
+    <jar basedir="bin" destfile="arduino-core.jar" />
+  </target>
+
+</project>

build/build.xml

@@ -42,7 +42,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" />
@@ -87,12 +87,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>