diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 29 |
1 files changed, 5 insertions, 24 deletions
@@ -39,7 +39,6 @@ jackunittests-lib-clean, jackunittests-clean, jack-tests-clean, - antlr-clean, args4j-lib-clean, dx-lib-clean, ecj-clean, @@ -74,7 +73,6 @@ <property name="jack-launcher.dir" value="${jack-project.dir}/jack-launcher" /> <property name="jack-server.dir" value="${jack-project.dir}/jack-server" /> <property name="jack-tests.dir" value="${jack-project.dir}/jack-tests" /> - <property name="antlr.dir" value="${jack-project.dir}/antlr"/> <property name="args4j.dir" value="${jack-project.dir}/args4j"/> <property name="ddm-lib.dir" value="${jack-project.dir}/ddmlib"/> <property name="dx.dir" value="${jack-project.dir}/dx"/> @@ -209,7 +207,7 @@ </target> <target name="jack-lib-compile-step1" - depends="jack-copy-libs,sched-build,antlr,sched-build-lib,allocation-lib, + depends="jack-copy-libs,sched-build,sched-build-lib,allocation-lib, dx-lib,freemarker-lib,maths-lib,sched-lib,watchmaker-lib"> <!-- project layout --> <!-- avoid incremental compilation with annotation processor --> @@ -238,7 +236,6 @@ <copy todir="${jack.tools.dir}" flatten="true"> <filelist dir="/" > <file name="${sched-build.dist.dir}/${sched-build.execname}" /> - <file name="${antlr.dist.dir}/${antlr.execname}" /> </filelist> </copy> </target> @@ -259,22 +256,22 @@ depends="jack-lib-compile-step1,jack-lib-generate-proguard-parser-check" unless="jack-lib.uptodate.proguardparser"> <!-- generate ProGuard parser --> - <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> + <exec executable="antlr3" failonerror="true"> <arg line="-fo" /> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard"/> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard/Proguard.g"/> - </java> + </exec> </target> <target name="jack-lib-generate-preprocessor-parser" depends="jack-lib-compile-step1,jack-lib-generate-preprocessor-parser-check" unless="jack-lib.uptodate.preprocessorparser"> <!-- generate PreProcessor parser --> - <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> + <exec executable="antlr3" failonerror="true"> <arg line="-fo" /> <arg line="${jack.dir}/src/com/android/jack/preprocessor"/> <arg line="${jack.dir}/src/com/android/jack/preprocessor/PreProcessor.g"/> - </java> + </exec> </target> <target name="jack-lib-compile-step2" @@ -833,22 +830,6 @@ <!-- ******************* --> - <!-- antlr --> - <!-- ******************* --> - <property name="antlr.dist.dir" value="${build-top.dir}/antlr/dist" /> - <property name="antlr.execname" value="antlr.jar"/> - - <target name="antlr-clean"> - <delete dir="${antlr.dist.dir}"/> - </target> - - <target name="antlr"> - <mkdir dir="${antlr.dist.dir}"/> - <copy file="${antlr.dir}/antlr-3.4-complete.jar" tofile="${antlr.dist.dir}/${antlr.execname}"/> - </target> - - - <!-- ******************* --> <!-- args4j-lib --> <!-- ******************* --> <property name="args4j.build.dir" value="${build-top.dir}/args4j/build"/> |