diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-05-14 13:16:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 13:16:42 +0000 |
| commit | 971765f73a7b0a5c4545d7bbc7d5007b4b991d19 (patch) | |
| tree | 07e48e689a864ebd0bfa156d67498c893731ef41 | |
| parent | 34177e5cba823f7759135b71efa5e238c0ac3906 (diff) | |
| parent | a4bb253805de5b11fa48cdbfa5856de78d858670 (diff) | |
| download | toolchain_jack-971765f73a7b0a5c4545d7bbc7d5007b4b991d19.zip toolchain_jack-971765f73a7b0a5c4545d7bbc7d5007b4b991d19.tar.gz toolchain_jack-971765f73a7b0a5c4545d7bbc7d5007b4b991d19.tar.bz2 | |
Merge "Fix bug in Ant script when building jack." into jack-wip-dev
| -rw-r--r-- | build.xml | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -66,7 +66,6 @@ <property name="tools.dir" value="tools"/> <property name="dx-ref.dir" value="dx-ref"/> - <!-- ******************* --> <!-- Jack-lib --> <!-- ******************* --> @@ -108,6 +107,8 @@ depends="jack-copy-libs,sched-build,antlr,sched-build-lib,allocation-lib,antlr-rt-lib, args4j-lib,dx-lib,ecj,freemarker-lib,guava-lib,jsr305-lib,maths-lib,sched-lib,watchmaker-lib"> <!-- project layout --> + <!-- avoid incremental compilation with annotation processor --> + <delete dir="${jack.build.outdir}"/> <mkdir dir="${jack.build.outdir}"/> <mkdir dir="${jack.libs.dir}"/> <mkdir dir="${jack.dist.dir}"/> @@ -173,13 +174,13 @@ <target name="jack" depends="jack-lib-compile"> <copy todir="${jack.exec.build.outdir}"> - <fileset dir="${jack.build.outdir}" includes="**/*.class" /> + <fileset dir="${jack.build.outdir}"/> </copy> <!-- generate jack.properties --> <property environment="env"/> <property name="jack.version.name.tag" value="eng.${env.USER}"/> <echo message="${jack.base.version.name}.${jack.base.version.code}.${jack.version.name.tag}" - file="${jack.build.outdir}/jack.properties"/> + file="${jack.exec.build.outdir}/jack.properties"/> <!-- package --> <copy todir="${jack.exec.build.outdir}"> <fileset dir="${jack.dir}/rsc" includes="**"/> @@ -310,6 +311,11 @@ source="1.5" target="1.5" createmissingpackageinfoclass="false" debug="true" includeantruntime="false"/> <!-- package --> + <copy todir="${args4j.build.outdir}"> + <fileset dir="${args4j.dir}/args4j/src"> + <include name="**/*.properties"/> + </fileset> + </copy> <jar destfile="${args4j.dist.dir}/${args4j.libname}" basedir="${args4j.build.outdir}" includes="**"/> @@ -522,6 +528,8 @@ <target name="sched-lib" depends="sched-copy-libs,sched-build-lib,guava-lib,jsr305-lib, allocation-lib,freemarker-lib,watchmaker-lib,maths-lib"> <!-- project layout --> + <!-- avoid incremental compilation with annotation processor --> + <delete dir="${schedlib.build.outdir}"/> <mkdir dir="${schedlib.build.outdir}"/> <mkdir dir="${schedlib.libs.dir}"/> <mkdir dir="${schedlib.dist.dir}"/> @@ -952,7 +960,6 @@ includes="**"/> </target> - </project> |