Add project dependency on Jill to Dx

This project does not directly depends on Dx but Eclipse Luna
raises an error because it depends on Jack which depends on Dx.
This patch also modify build.xml so as to raise a compilation
error if a direct reference to dx is done in jill tests.

Change-Id: I3428ade3078bf1fc884b8e9f006735de6aae1b12

1 files changed, 45 insertions, 3 deletions

diff --git a/build.xml b/build.xml
index f9b3f7a..d4c8968 100644
--- a/build.xml
+++ b/build.xml
@@ -19,9 +19,9 @@
 
   <import file="../jack/build.xml"/>
 
-  <target name="dist" depends="jill"/>
+  <target name="dist" depends="jill, jillunittests"/>
 
-  <target name="clean" depends="jill-clean,
+  <target name="clean" depends="jill-clean, jillunittests-clean,
     asm4-clean" />
 
   <dirname property="jill-project.dir" file="${ant.file.jill}"/>
@@ -33,7 +33,7 @@
   <!-- ******************* -->
   <!-- jill                -->
   <!-- ******************* -->
-  <property name="jill.build.dir" value="${jill.dir}/build" />
+  <property name="jill.build.dir" value="${jill.dir}/build/jill" />
   <property name="jill.libs.dir" value="${jill.dir}/libs" />
   <property name="jill.build.outdir" value="${jill.build.dir}/classes" />
   <property name="jill.dist.dir" value="${jill.dir}/dist" />
@@ -103,6 +103,48 @@
 
 
   <!-- ******************* -->
+  <!-- jillunittests       -->
+  <!-- ******************* -->
+  <property name="jillunittests.build.dir" value="${jill.dir}/build/jillunittests" />
+  <property name="jillunittests.build.outdir" value="${jillunittests.build.dir}/classes" />
+  <property name="jillunittests.execname" value="jillunittests.jar" />
+
+  <target name="jillunittests-clean">
+    <delete dir="${jillunittests.build.dir}" />
+    <delete dir="${jill.dist.dir}/${jillunittests.execname}" />
+  </target>
+
+  <target name="jillunittests" depends="jill, jackunittests">
+    <!-- project layout -->
+    <mkdir dir="${jillunittests.build.outdir}"/>
+    <!-- compile -->
+    <javac srcdir="${jill.dir}/tests"
+          destdir="${jillunittests.build.outdir}"
+          source="1.5" target="1.5"
+          debug="true" includeantruntime="false">
+      <classpath>
+        <filelist dir="/">
+          <file name="${jill.dist.dir}/${jill.execname}" />
+          <file name="${jackunittests.dist.dir}/${jackunittests.execname}" />
+        </filelist>
+      </classpath>
+    </javac>
+    <!-- package -->
+    <copy todir="${jillunittests.build.outdir}">
+        <fileset dir="${jill.build.outdir}">
+          <include name="**/*" />
+        </fileset>
+        <filelist dir="/">
+        <file name="${jackunittests.dist.dir}/${jackunittests.execname}" />
+      </filelist>
+    </copy>
+    <jar destfile="${jill.dist.dir}/${jillunittests.execname}"
+            basedir="${jillunittests.build.outdir}"
+            includes="**"/>
+  </target>
+
+
+  <!-- ******************* -->
   <!-- asm4                -->
   <!-- ******************* -->
   <property name="asm4.build.dir" value="${asm4.dir}/build" />