change build scripts to use built-in ecj (removes jdk req)

benfry · benfry · commit 9271c4e0c0ad · 2013-09-12T19:21:57.000-04:00
diff --git a/app/build.xml b/app/build.xml
@@ -92,9 +92,12 @@
 	   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"
-	   debug="on">
+	   debug="on"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
       <src path="src" />
       <src path="generated" />
+      <compilerclasspath path="../java/mode/ecj.jar" />
     </javac>
   </target>
 
diff --git a/build/build.xml b/build/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="Processing" default="build">
-  
+
   <!-- Sets properties for macosx/windows/linux depending on current system -->
   <condition property="platform" value="macosx">
     <os family="mac" /> 
@@ -36,22 +36,26 @@
 
   <!-- Make sure that we have a legitimate JDK... This was promoted 
        from app/build.xml because we now need this on OS X as well. -->
+  <!--
   <property name="java_home" value="${env.JAVA_HOME}" />
   <available file="${env.JAVA_HOME}/lib/tools.jar"
 	     property="java_tools_found" />
 
   <fail if="windows" unless="java_tools_found" 
 	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_19." />
+  -->
 
   <!-- OS X gets a second chance that covers JDK 6, 
        a necessity for building on OS X 10.6. -->
+  <!--
   <available file="/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar" property="java_tools_found" />
 
   <fail if="macosx" unless="java_tools_found"
 	message="To build on OS X, you must install both Apple's Java 6 and Oracle's JDK 7 (not just the plugin). Then add this line: ${line.separator}export JAVA_HOME=`/usr/libexec/java_home`${line.separator}to ~/.profile and open a new Terminal window." />
 
   <fail if="linux" unless="java_tools_found" 
 	message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Ubuntu Linux, this might be /usr/lib/jvm/java-6-sun." />
+  -->
 	       
   <!-- Figure out the platform-specific output directory for all this work. -->
   <condition property="target.path" 
diff --git a/build/shared/tools/MovieMaker/build.xml b/build/shared/tools/MovieMaker/build.xml
@@ -24,7 +24,11 @@
 	   destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../../app/bin" />
+	   classpath="../../../../app/bin" 
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../../../java/mode/ecj.jar" />
+    </javac>
   </target>
 
   <target name="build" depends="compile" description="Build Movie Maker Tool">
diff --git a/core/build.xml b/core/build.xml
@@ -19,7 +19,11 @@
 	   includeAntRuntime="false"
 	   debug="true"
 	   srcdir="src" destdir="bin"
-	   classpath="library/jogl-all.jar; library/gluegen-rt.jar" />
+	   classpath="library/jogl-all.jar; library/gluegen-rt.jar"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../java/mode/ecj.jar" />
+    </javac>
     
     <!-- Copy the jnilib to the bin folder so it's included. -->
     <copy todir="bin/japplemenubar" 
diff --git a/core/methods/build.xml b/core/methods/build.xml
@@ -7,7 +7,11 @@
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
 	   debug="true" 
-	   includeantruntime="true" />
+	   includeantruntime="true"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../java/mode/ecj.jar" />
+    </javac>
   </target>
   
   <target name="task-lib" depends="compile">
diff --git a/experimental/build.xml b/experimental/build.xml
@@ -48,7 +48,10 @@
 	   encoding="UTF-8" 
 	   includeAntRuntime="false" 
 	   classpath="../core/library/core.jar; ${env.JAVA_HOME}/lib/tools.jar; ../app/lib/ant.jar; ../app/lib/ant-launcher.jar; ../app/lib/antlr.jar; ../app/lib/apple.jar; ../app/lib/jdt-core.jar; ../app/lib/jna.jar; ../app/lib/org-netbeans-swing-outline.jar; ../app/pde.jar; mode/CompilationChecker.jar; mode/com.ibm.icu_4.4.2.v20110823.jar; mode/jdi.jar; mode/jdimodel.jar; mode/org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar; mode/org.eclipse.core.jobs_3.5.300.v20120622-204750.jar; mode/org.eclipse.core.resources_3.8.1.v20120802-154922.jar; mode/org.eclipse.core.runtime_3.8.0.v20120521-2346.jar; mode/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar; mode/org.eclipse.equinox.preferences_3.5.0.v20120522-1841.jar; mode/org.eclipse.jdt.core_3.8.2.v20120814-155456.jar; mode/org.eclipse.jdt.debug_3.7.101.v20120725-115645.jar; mode/org.eclipse.osgi_3.8.1.v20120830-144521.jar; mode/org.eclipse.text_3.5.200.v20120523-1310.jar"
-	   debug="on">
+	   debug="on"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../java/mode/ecj.jar" />
       <src path="src" />
     </javac>
   </target>
diff --git a/java/libraries/dxf/build.xml b/java/libraries/dxf/build.xml
@@ -18,7 +18,11 @@
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar" />
+	   classpath="../../../core/library/core.jar"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../mode/ecj.jar" />
+    </javac>
   </target>
   
   <target name="build" depends="compile" description="Build DXF library">
diff --git a/java/libraries/lwjgl/build.xml b/java/libraries/lwjgl/build.xml
@@ -18,7 +18,11 @@
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar; library/lwjgl.jar; library/lwjgl_util.jar" />
+	   classpath="../../../core/library/core.jar; library/lwjgl.jar; library/lwjgl_util.jar" 
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../mode/ecj.jar" />
+    </javac>
   </target>
   
   <target name="build" depends="compile" description="Build OpenGL LWJGL library">
diff --git a/java/libraries/net/build.xml b/java/libraries/net/build.xml
@@ -18,7 +18,11 @@
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar" />
+	   classpath="../../../core/library/core.jar"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../mode/ecj.jar" />
+    </javac>
   </target>
 
   <target name="build" depends="compile" description="Build net library">
diff --git a/java/libraries/pdf/build.xml b/java/libraries/pdf/build.xml
@@ -18,7 +18,11 @@
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar; library/itext.jar" />
+	   classpath="../../../core/library/core.jar; library/itext.jar"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../mode/ecj.jar" />
+    </javac>
   </target>
   
   <target name="build" depends="compile" description="Build PDF library">
diff --git a/java/libraries/serial/build.xml b/java/libraries/serial/build.xml
@@ -18,7 +18,11 @@
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar; library/RXTXcomm.jar" />
+	   classpath="../../../core/library/core.jar; library/RXTXcomm.jar"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../mode/ecj.jar" />
+    </javac>
   </target>
   
   <target name="build" depends="compile" description="Build serial library">
diff --git a/java/libraries/video/build.xml b/java/libraries/video/build.xml
@@ -18,7 +18,11 @@
 	   srcdir="src" destdir="bin" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../core/library/core.jar; library/gstreamer-java.jar; library/jna.jar" />
+	   classpath="../../../core/library/core.jar; library/gstreamer-java.jar; library/jna.jar"
+	   nowarn="true"
+	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+      <compilerclasspath path="../../mode/ecj.jar" />
+    </javac>
   </target>
   
   <target name="build" depends="compile" description="Build video library">
