diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-08 15:30:00 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-08 15:30:40 +0100 |
commit | 193fc70a4480e1f2498ec4afcf3c7014dc029b82 (patch) | |
tree | 65285c32e40e8e5d2705e4ddb60ea5928121f4c1 | |
parent | 2310985ea790a23c5ab432bbd4c8f129f3ee2730 (diff) | |
download | toolchain_jack-193fc70a4480e1f2498ec4afcf3c7014dc029b82.zip toolchain_jack-193fc70a4480e1f2498ec4afcf3c7014dc029b82.tar.gz toolchain_jack-193fc70a4480e1f2498ec4afcf3c7014dc029b82.tar.bz2 |
move build dirs out of repo
add simple out dirs to gitignore
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | build.xml | 129 |
2 files changed, 66 insertions, 64 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..27595d2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +simple/*/target @@ -100,7 +100,8 @@ <!-- Distributed files --> <!-- ******************* --> - <property name="jack-top-dist.dir" value="${jack-project.dir}/dist" /> + <property name="build-top.dir" value="${jack-project.dir}/../../jack_jill/build/jack"/> + <property name="jack-top-dist.dir" value="${build-top.dir}/dist" /> <target name="dist-clean"> <delete dir="${jack-top-dist.dir}"/> @@ -175,12 +176,12 @@ <!-- Jack-lib --> <!-- ******************* --> - <property name="jack.build.dir" value="${jack.dir}/build/jack-lib" /> - <property name="jack.libs.dir" value="${jack.dir}/libs" /> - <property name="jack.prebuilts.dir" value="${jack.dir}/prebuilts" /> + <property name="jack.build.dir" value="${build-top.dir}/build/jack-lib" /> + <property name="jack.libs.dir" value="${build-top.dir}/libs" /> + <property name="jack.prebuilts.dir" value="${build-top.dir}/prebuilts" /> <property name="jack.build.outdir" value="${jack.build.dir}/classes" /> - <property name="jack.tools.dir" value="${jack.dir}/tools" /> - <property name="jack.dist.dir" value="${jack.dir}/dist" /> + <property name="jack.tools.dir" value="${build-top.dir}/tools" /> + <property name="jack.dist.dir" value="${build-top.dir}/dist" /> <property name="jack.libname" value="jack-lib.jar" /> <target name="jack-lib-clean"> @@ -245,13 +246,13 @@ <target name="jack-lib-generate-proguard-parser-check"> <uptodate property="jack-lib.uptodate.proguardparser" srcfile="${jack.dir}/src/com/android/jack/shrob/proguard/Proguard.g" - targetfile="${jack.dir}/src/com/android/jack/shrob/proguard/ProguardParser.java"/> + targetfile="${build-top.dir}/src/com/android/jack/shrob/proguard/ProguardParser.java"/> </target> <target name="jack-lib-generate-preprocessor-parser-check"> <uptodate property="jack-lib.uptodate.preprocessorparser" srcfile="${jack.dir}/src/com/android/jack/preprocessor/PreProcessor.g" - targetfile="${jack.dir}/src/com/android/jack/preprocessor/PreProcessorParser.java"/> + targetfile="${build-top.dir}/src/com/android/jack/preprocessor/PreProcessorParser.java"/> </target> <target name="jack-lib-generate-proguard-parser" @@ -316,8 +317,8 @@ <!-- jack-intermediate --> <!-- ******************* --> - <property name="jack.intermediate.dist.dir" value="${jack.dir}/dist"/> - <property name="jack.intermediate.build.dir" value="${jack.dir}/build/jack-intermediate"/> + <property name="jack.intermediate.dist.dir" value="${build-top.dir}/dist"/> + <property name="jack.intermediate.build.dir" value="${build-top.dir}/build/jack-intermediate"/> <property name="jack.intermediate.build.outdir" value="${jack.intermediate.build.dir}/classes"/> <property name="jack.intermediatename" value="jack-intermediate.jar"/> @@ -355,7 +356,7 @@ <!-- ******************* --> <!-- jack --> <!-- ******************* --> - <property name="jack.exec.build.dir" value="${jack.dir}/build/jack"/> + <property name="jack.exec.build.dir" value="${build-top.dir}/build/jack"/> <property name="jack.exec.build.outdir" value="${jack.exec.build.dir}/classes"/> <property name="jack.execname" value="jack.jar"/> @@ -392,10 +393,10 @@ <!-- ******************* --> <!-- jack-api-lib --> <!-- ******************* --> - <property name="jack-api.lib.build.dir" value="${jack-api.dir}/build/lib" /> + <property name="jack-api.lib.build.dir" value="${build-top.dir}/jack-api/build/lib" /> <property name="jack-api.lib.build.outdir" value="${jack-api.lib.build.dir}/classes" /> - <property name="jack-api.libs.dir" value="${jack-api.dir}/libs" /> - <property name="jack-api.dist.dir" value="${jack-api.dir}/dist" /> + <property name="jack-api.libs.dir" value="${build-top.dir}/jack-api/libs" /> + <property name="jack-api.dist.dir" value="${build-top.dir}/jack-api/dist" /> <property name="jack-api.lib.name" value="jack-api-lib.jar" /> <target name="jack-api-lib-clean"> @@ -441,7 +442,7 @@ <!-- ******************* --> <!-- jack-api --> <!-- ******************* --> - <property name="jack-api.build.dir" value="${jack-api.dir}/build/exec" /> + <property name="jack-api.build.dir" value="${build-top.dir}/jack-api/build/exec" /> <property name="jack-api.build.outdir" value="${jack-api.build.dir}/classes" /> <property name="jack-api.name" value="jack-api.jar" /> @@ -471,9 +472,9 @@ <!-- ******************* --> <!-- jack-launcher --> <!-- ******************* --> - <property name="jack-launcher.build.dir" value="${jack-launcher.dir}/build" /> - <property name="jack-launcher.dist.dir" value="${jack-launcher.dir}/dist" /> - <property name="jack-launcher.libs.dir" value="${jack-launcher.dir}/libs" /> + <property name="jack-launcher.build.dir" value="${build-top.dir}/jack-launcher/build" /> + <property name="jack-launcher.dist.dir" value="${build-top.dir}/jack-launcher/dist" /> + <property name="jack-launcher.libs.dir" value="${build-top.dir}/jack-launcher/libs" /> <property name="jack-launcher.build.outdir" value="${jack-launcher.build.dir}/classes" /> <property name="jack-launcher.name" value="jack-launcher.jar" /> @@ -518,8 +519,8 @@ <!-- ******************* --> <!-- jack-server-lib --> <!-- ******************* --> - <property name="jack-server.build.dir" value="${jack-server.dir}/build" /> - <property name="jack-server.libs.dir" value="${jack-server.dir}/libs" /> + <property name="jack-server.build.dir" value="${build-top.dir}/jack-server/build" /> + <property name="jack-server.libs.dir" value="${build-top.dir}/jack-server/libs" /> <property name="jack-server.build.outdir" value="${jack-server.build.dir}/classes" /> <target name="jack-server-lib-clean"> @@ -570,7 +571,7 @@ <!-- ********************** --> <!-- jack-annotations-lib --> <!-- ********************** --> - <property name="jack-annotations.build.dir" value="${jack.dir}/build/annotations" /> + <property name="jack-annotations.build.dir" value="${build-top.dir}/build/annotations" /> <property name="jack-annotations.build.outdir" value="${jack-annotations.build.dir}/classes" /> <property name="jack-annotations.libname" value="jack-annotations.jar" /> @@ -834,7 +835,7 @@ <!-- ******************* --> <!-- antlr --> <!-- ******************* --> - <property name="antlr.dist.dir" value="${antlr.dir}/dist" /> + <property name="antlr.dist.dir" value="${build-top.dir}/antlr/dist" /> <property name="antlr.execname" value="antlr.jar"/> <target name="antlr-clean"> @@ -850,9 +851,9 @@ <!-- ******************* --> <!-- args4j-lib --> <!-- ******************* --> - <property name="args4j.build.dir" value="${args4j.dir}/build"/> + <property name="args4j.build.dir" value="${build-top.dir}/args4j/build"/> <property name="args4j.build.outdir" value="${args4j.build.dir}/classes"/> - <property name="args4j.dist.dir" value="${args4j.dir}/dist"/> + <property name="args4j.dist.dir" value="${build-top.dir}/args4j/dist"/> <property name="args4j.libname" value="args4j-lib.jar"/> <target name="args4j-lib-clean"> @@ -894,7 +895,7 @@ <!-- ddmlib --> <!-- ******************* --> <property name="ddm-lib.libname" value="ddmlib.jar"/> - <property name="ddm-lib.dist.dir" value="${ddm-lib.dir}/dist"/> + <property name="ddm-lib.dist.dir" value="${build-top.dir}/ddmlib/dist"/> <target name="ddm-lib-clean"> <delete file="${ddm-lib.dist.dir}/${ddm-lib.libname}"/> @@ -909,10 +910,10 @@ <!-- ******************* --> <!-- dx-lib --> <!-- ******************* --> - <property name="dx.build.dir" value="${dx.dir}/build"/> - <property name="dx.libs.dir" value="${dx.dir}/libs"/> - <property name="dx.build.outdir" value="${dx.build.dir}/classes"/> - <property name="dx.dist.dir" value="${dx.dir}/dist"/> + <property name="dx.build.dir" value="${build-top.dir}/dx/build"/> + <property name="dx.libs.dir" value="${build-top.dir}/dx/libs"/> + <property name="dx.build.outdir" value="${build-top.dir}/dx/classes"/> + <property name="dx.dist.dir" value="${build-top.dir}/dx/dist"/> <property name="dx.libname" value="dx-lib.jar"/> <target name="dx-lib-clean"> @@ -958,7 +959,7 @@ <!-- ecj --> <!-- ******************* --> <property name="ecj.libname" value="ecj.jar"/> - <property name="ecj.dist.dir" value="${ecj.dir}/dist"/> + <property name="ecj.dist.dir" value="${build-top.dir}/ecj/dist"/> <target name="ecj-clean"> <delete dir="${ecj.dist.dir}"/> @@ -974,8 +975,8 @@ <!-- simple-lib --> <!-- ******************* --> <property name="simple.libname" value="simple-lib.jar"/> - <property name="simple.dist.dir" value="${simple.dir}/dist"/> - <property name="simple.build.outdir" value="${simple.dir}/build/classes"/> + <property name="simple.dist.dir" value="${build-top.dir}/simple/dist"/> + <property name="simple.build.outdir" value="${build-top.dir}/simple/build/classes"/> <target name="simple-lib-clean"> <delete dir="${simple.dist.dir}"/> @@ -1011,7 +1012,7 @@ <!-- freemarker-lib --> <!-- ******************* --> <property name="freemarker.libname" value="freemarker-lib.jar"/> - <property name="freemarker.dist.dir" value="${freemarker.dir}/dist"/> + <property name="freemarker.dist.dir" value="${build-top.dir}/freemarker/dist"/> <target name="freemarker-lib-clean"> <delete dir="${freemarker.dist.dir}"/> @@ -1026,9 +1027,9 @@ <!-- ******************* --> <!-- guava-lib --> <!-- ******************* --> - <property name="guava.build.dir" value="${guava.dir}/build"/> + <property name="guava.build.dir" value="${build-top.dir}/guava/build"/> <property name="guava.build.outdir" value="${guava.build.dir}/classes"/> - <property name="guava.dist.dir" value="${guava.dir}/dist"/> + <property name="guava.dist.dir" value="${build-top.dir}/guava/dist"/> <property name="guava.libname" value="guava-lib.jar"/> <target name="guava-lib-clean"> @@ -1069,9 +1070,9 @@ <!-- ******************* --> <!-- jsr305-lib --> <!-- ******************* --> - <property name="jsr305.build.dir" value="${jsr305.dir}/build"/> + <property name="jsr305.build.dir" value="${build-top.dir}/jsr305/build"/> <property name="jsr305.build.outdir" value="${jsr305.build.dir}/classes"/> - <property name="jsr305.dist.dir" value="${jsr305.dir}/dist"/> + <property name="jsr305.dist.dir" value="${build-top.dir}/jsr305/dist"/> <property name="jsr305.libname" value="jsr305-lib.jar"/> <target name="jsr305-lib-clean"> @@ -1106,9 +1107,9 @@ <!-- ******************* --> <!-- maths-lib --> <!-- ******************* --> - <property name="maths.build.dir" value="${maths.dir}/build" /> + <property name="maths.build.dir" value="${build-top.dir}/maths/build" /> <property name="maths.build.outdir" value="${maths.build.dir}/classes" /> - <property name="maths.dist.dir" value="${maths.dir}/dist" /> + <property name="maths.dist.dir" value="${build-top.dir}/maths/dist" /> <property name="maths.libname" value="maths-lib.jar" /> <target name="maths-lib-clean"> @@ -1143,10 +1144,10 @@ <!-- ******************* --> <!-- sched-lib --> <!-- ******************* --> - <property name="schedlib.build.dir" value="${sched.dir}/build/sched-lib" /> - <property name="schedlib.libs.dir" value="${sched.dir}/libs" /> + <property name="schedlib.build.dir" value="${build-top.dir}/sched/build/sched-lib" /> + <property name="schedlib.libs.dir" value="${build-top.dir}/sched/libs" /> <property name="schedlib.build.outdir" value="${schedlib.build.dir}/classes" /> - <property name="schedlib.dist.dir" value="${sched.dir}/dist" /> + <property name="schedlib.dist.dir" value="${build-top.dir}/sched/dist" /> <property name="schedlib.libname" value="sched-lib.jar" /> <target name="sched-lib-clean"> @@ -1220,9 +1221,9 @@ <!-- ******************* --> <!-- sched-build-lib --> <!-- ******************* --> - <property name="sched-build.build.dir" value="${sched.dir}/build/sched-build-lib" /> + <property name="sched-build.build.dir" value="${build-top.dir}/sched/build/sched-build-lib" /> <property name="sched-build.build.outdir" value="${sched-build.build.dir}/classes" /> - <property name="sched-build.dist.dir" value="${sched.dir}/dist" /> + <property name="sched-build.dist.dir" value="${build-top.dir}/sched/dist" /> <property name="sched-build.libname" value="sched-build-lib.jar" /> <target name="sched-build-lib-clean"> @@ -1278,12 +1279,12 @@ <!-- sched-build --> <!-- ******************* --> <property name="sched-build.execname" value="sched-build.jar" /> - <property name="sched-build.exec.build.dir" value="${sched.dir}/build/sched-build" /> + <property name="sched-build.exec.build.dir" value="${build-top.dir}/sched/build/sched-build" /> <property name="sched-build.exec.build.outdir" value="${sched-build.exec.build.dir}/classes" /> <target name="sched-build-clean" depends="sched-build-lib-clean"> <delete dir="${sched-build.exec.build.dir}" /> - <delete file="${sched.dir}/tools/${sched-build.execname}" /> + <delete file="${build-top.dir}/sched/tools/${sched-build.execname}" /> <delete file="${sched-build.dist.dir}/${sched-build.execname}" /> </target> @@ -1299,7 +1300,7 @@ </copy> <jar destfile="${sched-build.dist.dir}/${sched-build.execname}" basedir="${sched-build.exec.build.outdir}" includes="**" manifest="${sched.dir}/etc/manifest.txt" /> - <copy file="${sched-build.dist.dir}/${sched-build.execname}" todir="${sched.dir}/tools"/> + <copy file="${sched-build.dist.dir}/${sched-build.execname}" todir="${build-top.dir}/sched/tools"/> </target> @@ -1356,10 +1357,10 @@ <!-- ******************* --> <!-- watchmaker-lib --> <!-- ******************* --> - <property name="watchmaker.build.dir" value="${watchmaker.dir}/build"/> - <property name="watchmaker.libs.dir" value="${watchmaker.dir}/libs"/> + <property name="watchmaker.build.dir" value="${build-top.dir}/watchmaker/build"/> + <property name="watchmaker.libs.dir" value="${build-top.dir}/watchmaker/libs"/> <property name="watchmaker.build.outdir" value="${watchmaker.build.dir}/classes"/> - <property name="watchmaker.dist.dir" value="${watchmaker.dir}/dist" /> + <property name="watchmaker.dist.dir" value="${build-top.dir}/watchmaker/dist" /> <property name="watchmaker.libname" value="watchmaker-lib.jar"/> <target name="watchmaker-lib-clean"> @@ -1406,9 +1407,9 @@ <!-- ******************* --> <!-- antlr-runtime-lib --> <!-- ******************* --> - <property name="antlr-rt.build.dir" value="${antlr-rt.dir}/build" /> + <property name="antlr-rt.build.dir" value="${build-top.dir}/antlr-rt/build" /> <property name="antlr-rt.build.outdir" value="${antlr-rt.build.dir}/classes" /> - <property name="antlr-rt.dist.dir" value="${antlr-rt.dir}/dist" /> + <property name="antlr-rt.dist.dir" value="${build-top.dir}/antlr-rt/dist" /> <property name="antlr-rt.libname" value="antlr-runtime-lib.jar" /> <target name="antlr-rt-lib-clean"> @@ -1446,9 +1447,9 @@ <!-- ******************* --> <!-- allocation-lib --> <!-- ******************* --> - <property name="allocation.build.dir" value="${allocation.dir}/build" /> + <property name="allocation.build.dir" value="${build-top.dir}/allocation/build" /> <property name="allocation.build.outdir" value="${allocation.build.dir}/classes" /> - <property name="allocation.dist.dir" value="${allocation.dir}/dist" /> + <property name="allocation.dist.dir" value="${build-top.dir}/allocation/dist" /> <property name="allocation.libname" value="allocation-lib.jar" /> <target name="allocation-lib-clean"> @@ -1489,9 +1490,9 @@ <!-- ******************* --> <!-- junit4-lib --> <!-- ******************* --> - <property name="junit4.build.dir" value="${junit4.dir}/build/junit4-lib" /> + <property name="junit4.build.dir" value="${build-top.dir}/junit4/build/junit4-lib" /> <property name="junit4.build.outdir" value="${junit4.build.dir}/classes" /> - <property name="junit4.dist.dir" value="${junit4.dir}/dist" /> + <property name="junit4.dist.dir" value="${build-top.dir}/junit4/dist" /> <property name="junit4.libname" value="junit4-lib.jar" /> <target name="junit4-lib-clean"> @@ -1535,7 +1536,7 @@ <!-- junit4 --> <!-- ******************* --> <property name="junit4.execname" value="junit4.jar" /> - <property name="junit4.exec.build.dir" value="${junit4.dir}/build/junit4" /> + <property name="junit4.exec.build.dir" value="${build-top.dir}/junit4/build/junit4" /> <property name="junit4.exec.build.outdir" value="${junit4.exec.build.dir}/classes" /> <target name="junit4-clean" depends="junit4-lib-clean"> @@ -1590,9 +1591,9 @@ <!-- ******************* --> <!-- hamcrest-core-lib --> <!-- ******************* --> - <property name="hamcrest-core.build.dir" value="${hamcrest-core.dir}/build" /> + <property name="hamcrest-core.build.dir" value="${build-top.dir}/hamcrest-core/build" /> <property name="hamcrest-core.build.outdir" value="${hamcrest-core.build.dir}/classes" /> - <property name="hamcrest-core.dist.dir" value="${hamcrest-core.dir}/dist" /> + <property name="hamcrest-core.dist.dir" value="${build-top.dir}/hamcrest-core/dist" /> <property name="hamcrest-core.libname" value="hamcrest-core-lib.jar" /> <target name="hamcrest-core-lib-clean"> @@ -1627,9 +1628,9 @@ <!-- ************************ --> <!-- hamcrest-core-jack-lib --> <!-- ************************ --> - <property name="hamcrest-core-jack.build.dir" value="${hamcrest-core.dir}/build" /> + <property name="hamcrest-core-jack.build.dir" value="${build-top.dir}/hamcrest-core/build" /> <property name="hamcrest-core-jack.build.outdir" value="${hamcrest-core-jack.build.dir}/classes" /> - <property name="hamcrest-core-jack.dist.dir" value="${hamcrest-core-jack.dir}/dist" /> + <property name="hamcrest-core-jack.dist.dir" value="${build-top.dir}/hamcrest-core/dist" /> <property name="hamcrest-core-jack.libname" value="hamcrest-core-jack-lib.zip" /> <target name="hamcrest-core-jack-lib-clean"> @@ -1734,9 +1735,9 @@ <!-- ******************* --> <!-- dex-lib --> <!-- ******************* --> - <property name="dexlib.build.dir" value="${dexlib.dir}/build" /> + <property name="dexlib.build.dir" value="${build-top.dir}/dexlib/build" /> <property name="dexlib.build.outdir" value="${dexlib.build.dir}/classes" /> - <property name="dexlib.dist.dir" value="${dexlib.dir}/dist" /> + <property name="dexlib.dist.dir" value="${build-top.dir}/dexlib/dist" /> <property name="dexlib.libname" value="dex-lib.jar" /> <property name="dexlib.version" value="1.4.2" /> @@ -1788,7 +1789,7 @@ <!-- ******************* --> <!-- jack-default-lib --> <!-- ******************* --> - <property name="jack-default-lib.build.outdir" value="${jack.dir}/build/default-lib/jack-lib"/> + <property name="jack-default-lib.build.outdir" value="${build-top.dir}/build/default-lib/jack-lib"/> <target name="jack-default-lib-clean"> <delete dir="${jack-default-lib.build.outdir}" /> |