next stage of mess

app/build.xml

@@ -1,53 +1,16 @@
 <?xml version="1.0"?>
 <project name="Processing PDE" default="build">
 
-  <property name="generated" 
-	    value="${basedir}/generated/processing/mode/java/preproc" />
-  <mkdir dir="${generated}" />
-
-  <property name="grammars" 
-	    value="${basedir}/src/processing/mode/java/preproc" />
-
-  <property name="antlrjar" 
-	    value="${basedir}/lib/antlr.jar" />
-
-  <classloader taskname="antlr">
-    <classpath path="lib/antlr.jar" />
-  </classloader>
-
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="pde.jar" />
-    <delete>
-      <fileset dir="${generated}">
-	<include name="*.java" />
-	<include name="*.tokens" />
-	<include name="*.txt" />
-	<include name="*.g" />
-	<include name="*.smap" />
-	<include name="*.properties" />
-      </fileset>
-    </delete>
   </target>
 
-<!--<target name="preproc" depends="clean" description="Compile ANTLR grammar">-->
-  <target name="preproc" description="Compile ANTLR grammar">
-    <antlr target="${grammars}/java15.g" outputdirectory="${generated}">
-      <classpath path="${antlrjar}" />
-    </antlr>
-    <antlr target="${grammars}/pde.g" 
-	   outputdirectory="${generated}" 
-	   glib="${grammars}/java15.g">
-      <classpath path="${antlrjar}" />
-    </antlr>
-  </target>
-
-  <target name="compile" depends="preproc" description="Compile sources">
+  <target name="compile" description="Compile sources">
     <condition property="core-built">
       <available file="../core/library/core.jar" />
     </condition>
-    <fail unless="core-built" 
-	  message="Please build the core library first and make sure it sits in ../core/library/core.jar" />
+    <fail unless="core-built" message="Please build the core library first and make sure it is located at ../core/library/core.jar" />
 
     <mkdir dir="bin" />
     
@@ -71,13 +34,16 @@
 	   excludes="**/tools/format/**" 
 	   encoding="UTF-8" 
 	   includeAntRuntime="false" 
-	   classpath="../core/library/core.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"
+	   classpath="../core/library/core.jar; 
+                      lib/ant.jar; lib/ant-launcher.jar; 
+                      lib/apple.jar; 
+                      lib/jna.jar"
 	   debug="on"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
       <src path="src" />
-      <src path="generated" />
-      <compilerclasspath path="../java/mode/ecj.jar" />
+      <compilerclasspath path="../java/mode/org.eclipse.jdt.core.jar; 
+                               ../java/mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
 

core/build.xml

@@ -12,15 +12,15 @@
 	     classpath="methods/methods.jar" />
     <methods dir="${basedir}/src/processing/core" recorder="true" />
 
-    <!-- Check for ecj.jar, since this is likely a PDE build. Using ECJ
-	 allows us to build the PDE with only a JRE on Windows and Linux.
+    <!-- Check for JDT compiler, since this is likely a PDE build. Using
+	 it allows us to build the PDE with only a JRE on Windows and Linux.
 	 So that the core can be built independently of the PDE, 
 	 use javac (the "modern" compiler) if ecj is not present. -->
-    <property name="ecj.jar" value="../java/mode/ecj.jar" />
+    <property name="jdt.jar" value="../java/mode/org.eclipse.jdt.core.jar" />
     <condition property="build.compiler" 
 	       value="org.eclipse.jdt.core.JDTCompilerAdapter"
 	       else="modern">
-      <available file="${ecj.jar}" />
+      <available file="${jdt.jar}" />
     </condition>
     <!--<echo message="compiler is ${build.compiler}" />-->
 
@@ -34,7 +34,7 @@
 	   classpath="library/jogl-all.jar; library/gluegen-rt.jar"
 	   nowarn="true">
       <!-- kinda gross, but if not using ecj, this just ignored anyway -->
-      <compilerclasspath path="${ecj.jar}" />
+      <compilerclasspath path="${jdt.jar}; ../java/mode/jdtCompilerAdapter.jar" />
     </javac>
     
     <!-- Copy the jnilib to the bin folder so it's included. -->

java/mode/readme.txt

@@ -4,8 +4,9 @@ http://download.eclipse.org/eclipse/downloads/
 File listing at:
 http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/?d
 
-The jdi.jar and jdimodel.jar files are unpacked 
-from the org.eclipse.jdt.debug JAR file.
+The jdtCompilerAdapter.jar is extracted from org.eclipse.jdt.core.jar to provide
+the JDTCompilerAdapter class, which is the Ant task for the JDT compiler.
+The jdi.jar and jdimodel.jar files are unpacked from org.eclipse.jdt.debug.jar.
 
 This Mode does not use ecj.jar from the original Java mode, because its files are contained in the JARs below.