change compiler to use intellij form

katzfey · Dec 28, 2017 · 053bfb7 · 053bfb7
1 parent 770d51a
commit 053bfb7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/build.xml b/build.xml
@@ -21,12 +21,22 @@
         <pathelement location="lib/annotations.jar"/>
     </path>
 
+    <path id="javac2.class.path">
+        <pathelement location="lib/annotations.jar"/>
+        <pathelement location="lib/javac2.jar"/>
+        <pathelement location="lib/asm4-all.jar"/>
+        <pathelement location="lib/jdom.jar"/>
+        <pathelement location="lib/vecmath.jar"/>
+    </path>
+
+    <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.class.path"/>
+
     <target name="compile" description="Compile java sources" depends="make_dirs">
-        <javac destdir="${classes.dir}" includeantruntime="false" debug="true">
+        <javac2 destdir="${classes.dir}" includeantruntime="false" debug="true">
             <classpath refid="libsclasspath"/>
             <src path="src"/>
             <src path="jMAVlib/src"/>
-        </javac>
+        </javac2>
     </target>
 
     <target name="jmavsim" description="Link classes and JARs for jMAVSim" depends="compile">
@@ -55,6 +65,7 @@
             <zipfileset dir="lib" includes="jogl-all.jar"/>
             <zipfileset dir="lib" includes="jssc.jar"/>
             <zipfileset dir="lib" includes="vecmath.jar"/>
+            <zipgroupfileset dir="lib" includes="forms_rt.jar"/>
 
             <!-- OS-specific jars (can exclude any you don't need) -->
 

diff --git a/lib/asm4-all.jar b/lib/asm4-all.jar
diff --git a/lib/forms_rt.jar b/lib/forms_rt.jar
diff --git a/lib/javac2.jar b/lib/javac2.jar
diff --git a/lib/jdom.jar b/lib/jdom.jar