diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-17 15:48:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-17 15:48:47 +0000 |
| commit | 683791b55a708ae20733a0e34e10cd34c09eb937 (patch) | |
| tree | fd6e907bd0bb30900995eb7800129d5713cab55f | |
| parent | 0b1279a79a9d7b17e6fd8a1ad2558cc4e3a4d22f (diff) | |
| parent | 17a87fa9295dec7593ce0921d940c5e23c21900b (diff) | |
| download | toolchain_jill-683791b55a708ae20733a0e34e10cd34c09eb937.zip toolchain_jill-683791b55a708ae20733a0e34e10cd34c09eb937.tar.gz toolchain_jill-683791b55a708ae20733a0e34e10cd34c09eb937.tar.bz2 | |
Merge "Add project dependency on Jill to Dx" into ub-jack
| -rw-r--r-- | build.xml | 48 | ||||
| -rw-r--r-- | jill/.classpath | 1 |
2 files changed, 46 insertions, 3 deletions
@@ -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" /> diff --git a/jill/.classpath b/jill/.classpath index f648072..178c117 100644 --- a/jill/.classpath +++ b/jill/.classpath @@ -11,5 +11,6 @@ <classpathentry kind="lib" path="libs/guava-lib.jar"/> <classpathentry kind="lib" path="libs/jsr305-lib.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/Scheduler"/> + <classpathentry combineaccessrules="false" kind="src" path="/Dx"/> <classpathentry kind="output" path="bin"/> </classpath> |