Revert "Speed up Ant script"

This reverts commit 6f4d464b8728997b9e7052ac8ed169272859b229.

1 files changed, 18 insertions, 253 deletions

diff --git a/build.xml b/build.xml
index d895730..df9fc77 100644
--- a/build.xml
+++ b/build.xml
@@ -121,11 +121,12 @@
     </copy>
   </target>
 
-  <target name="jack-lib-compile-step1"
+  <target name="jack-lib-compile"
     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}"/>
@@ -154,54 +155,19 @@
         <file name="${antlr.dist.dir}/${antlr.execname}" />
       </filelist>
     </copy>
-  </target>
-
-  <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"/>
-  </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"/>
-    </target>
-
-  <target name="jack-lib-generate-proguard-parser"
-          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">
       <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>
-  </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">
       <arg line="-fo" />
       <arg line="${jack.dir}/src/com/android/jack/preprocessor"/>
       <arg line="${jack.dir}/src/com/android/jack/preprocessor/PreProcessor.g"/>
     </java>
-   </target>
-
-  <target name="jack-lib-compile-step2"
-    depends="jack-lib-generate-proguard-parser,jack-lib-generate-preprocessor-parser">
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${jack.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${jack.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${jack.dir}/src"
       destdir="${jack.build.outdir}"
       source="1.6" target="1.6"
@@ -215,7 +181,11 @@
     </javac>
   </target>
 
-  <target name="jack-lib" depends="jack-lib-compile-step2">
+  <target name="jack-lib" depends="jack-lib-compile">
+    <!-- package -->
+    <copy todir="${jack.build.outdir}">
+      <fileset dir="${jack.dir}/rsc" includes="**"/>
+    </copy>
     <jar destfile="${jack.dist.dir}/${jack.libname}"
       basedir="${jack.build.outdir}" includes="**"/>
   </target>
@@ -233,7 +203,7 @@
     <delete file="${jack.dist.dir}/${jack.execname}"/>
   </target>
 
-  <target name="jack" depends="jack-lib-compile-step2">
+  <target name="jack" depends="jack-lib-compile">
     <copy todir="${jack.exec.build.outdir}">
       <fileset dir="${jack.build.outdir}"/>
     </copy>
@@ -278,15 +248,6 @@
 
   <target name="jack-api-lib" depends="jack-api-lib-copy-libs">
     <mkdir dir="${jack-api.lib.build.outdir}"/>
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${jack-api.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${jack-api.lib.build.outdir}"/>
-      </targets>
-    </dependset>
      <javac srcdir="${jack-api.dir}/src" destdir="${jack-api.lib.build.outdir}"
           source="1.6" target="1.6" debug="true"
           includeantruntime="false"  includeDestClasses="false" nowarn="true">
@@ -349,7 +310,7 @@
     <delete file="${jackunittests.dist.dir}/${jackunittests.libname}" />
   </target>
 
-  <target name="jackunittests-lib" depends="jack-copy-libs,jack-lib,junit4,dex-lib,dx-ref-lib,dexcomparator-lib,
+  <target name="jackunittests-lib" depends="jack-copy-libs,jack-lib,junit4-lib,dex-lib,dx-ref-lib,dexcomparator-lib,
     sched-build,sched-build-lib">
     <!-- project layout -->
     <mkdir dir="${jackunittests.build.outdir}" />
@@ -368,15 +329,6 @@
       <file name="${dexcomparator.dist.dir}/${dexcomparator.libname}" />
     </filelist>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${jack.dir}/tests" />
-      </sources>
-      <targets>
-        <fileset dir="${jackunittests.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${jack.dir}/tests" destdir="${jackunittests.build.outdir}"
       source="1.6" target="1.6" debug="true"
       includeantruntime="false"  includeDestClasses="false" nowarn="true">
@@ -402,23 +354,7 @@
     <delete file="${jackunittests.dist.dir}/${jackunittests.execname}" />
   </target>
 
-  <target name="jackunittests-check">
-
-    <union id ="jackunittests.uptodate.files">
-      <filelist refid="jackunittests.static.libs.fileset"/>
-      <filelist refid="jack.static.libs.fileset"/>
-      <filelist dir="${jackunittests.dist.dir}">
-        <file name="${jackunittests.libname}"/>
-      </filelist>
-    </union>
-
-    <uptodate property="jackunittests.uptodate"
-      targetfile="${jackunittests.dist.dir}/${jackunittests.execname}">
-      <srcresources refid="jackunittests.uptodate.files"/>
-    </uptodate>
-  </target>
-
-  <target name="jackunittests" depends="jackunittests-lib,jackunittests-check" unless="jackunittests.uptodate">
+  <target name="jackunittests" depends="jackunittests-lib">
     <!-- add sched support -->
     <pathconvert property="jackunittests.static.libs.list" pathsep=" " refid="jackunittests.static.libs.fileset" />
     <pathconvert property="jack.static.libs.list" pathsep=" " refid="jack.static.libs.fileset" />
@@ -471,29 +407,6 @@
     <mkdir dir="${jack-tests.build.outdir}"/>
     <mkdir dir="${jack-tests.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <fileset id="jack-test.src.fileset" dir="${jack-tests.dir}/src"/>
-        <fileset id="jack-test.tests.fileset" dir="${jack-tests.dir}/tests">
-          <exclude name="com/android/jack/classpath/test002/lib1override/**"/>
-          <exclude name="com/android/jack/enums/test003/link/Other.java"/>
-          <exclude name="com/android/jack/enums/test003/link/Values.java"/>
-          <exclude name="com/android/jack/error/test001/jack/A.java"/>
-          <exclude name="com/android/jack/error/test002/jack/A.java"/>
-          <exclude name="com/android/jack/nopackage/jack/**"/>
-          <exclude name="com/android/jack/java7/boxing/**"/>
-          <exclude name="com/android/jack/java7/switches/**"/>
-          <exclude name="com/android/jack/java7/exceptions/**"/>
-          <exclude name="com/android/jack/java7/trywithresources/**"/>
-          <exclude name="com/android/jack/java7/parser/**"/>
-          <exclude name="com/android/jack/jarjar/test003/dontcompile/**"/>
-          <exclude name="com/android/jack/lookup/test001/liboverride/**"/>
-        </fileset>
-      </sources>
-      <targets>
-        <fileset dir="${jack-api.lib.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac
       destdir="${jack-tests.build.outdir}"
       source="1.6" target="1.6"
@@ -572,15 +485,6 @@
     <mkdir dir="${args4j.build.outdir}"/>
     <mkdir dir="${args4j.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${args4j.dir}/args4j/src" />
-      </sources>
-      <targets>
-        <fileset dir="${args4j.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${args4j.dir}/args4j/src"
       destdir="${args4j.build.outdir}"
       source="1.6" target="1.6"
@@ -635,15 +539,6 @@
     <!-- fetch dependencies -->
     <copy file="${jsr305.dist.dir}/${jsr305.libname}" todir="${dx.libs.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${dx.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${dx.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${dx.dir}/src"
       destdir="${dx.build.outdir}"
       source="1.6" target="1.6"
@@ -726,15 +621,6 @@
     <!-- project layout -->
     <mkdir dir="${guava.build.outdir}"/>
     <mkdir dir="${guava.dist.dir}"/>
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${guava.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${guava.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac source="1.6" target="1.6"
       srcdir="${guava.dir}/src"
       destdir="${guava.build.outdir}"
@@ -770,15 +656,6 @@
     <mkdir dir="${jsr305.build.outdir}"/>
     <mkdir dir="${jsr305.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${jsr305.dir}/ri/src/main/java" />
-      </sources>
-      <targets>
-        <fileset dir="${jsr305.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${jsr305.dir}/ri/src/main/java"
       destdir="${jsr305.build.outdir}"
       source="1.6" target="1.6"
@@ -808,15 +685,6 @@
     <mkdir dir="${maths.build.outdir}"/>
     <mkdir dir="${maths.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${maths.dir}/core/src/java/main" />
-      </sources>
-      <targets>
-        <fileset dir="${maths.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${maths.dir}/core/src/java/main"
     destdir="${maths.build.outdir}"
       source="1.6" target="1.6"
@@ -862,6 +730,7 @@
     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}"/>
@@ -876,15 +745,6 @@
     </filelist>
 
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${sched.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${schedlib.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${sched.dir}/src" destdir="${schedlib.build.outdir}"
       source="1.6" target="1.6" debug="true" includeantruntime="false"  includeDestClasses="false">
       <classpath>
@@ -923,18 +783,6 @@
     <mkdir dir="${sched-build.build.outdir}"/>
     <mkdir dir="${sched-build.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <filelist dir="${sched.dir}/src">
-            <file name="com/android/sched/build/SchedAnnotationProcessor.java" />
-            <file name="com/android/sched/build/JarMerger.java"/>
-          </filelist>
-      </sources>
-      <targets>
-        <fileset dir="${sched-build.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac
        srcdir="${sched.dir}/src"
        destdir="${sched-build.build.outdir}"
@@ -1014,15 +862,6 @@
       <file name="${junit4.dist.dir}/${junit4.libname}" />
     </filelist>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${sched.dir}/tests" />
-      </sources>
-      <targets>
-        <fileset dir="${schedtests.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${sched.dir}/tests"
       destdir="${schedtests.build.outdir}"
       source="1.6" target="1.6"
@@ -1058,15 +897,6 @@
     <mkdir dir="${watchmaker.build.outdir}"/>
     <mkdir dir="${watchmaker.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${watchmaker.dir}/framework/src/java/main" />
-      </sources>
-      <targets>
-        <fileset dir="${watchmaker.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${watchmaker.dir}/framework/src/java/main"
       destdir="${watchmaker.build.outdir}"
       source="1.6" target="1.6"
@@ -1103,15 +933,6 @@
     <mkdir dir="${antlr-rt.build.outdir}"/>
     <mkdir dir="${antlr-rt.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${antlr-rt.dir}/antlr-3.4/runtime/Java/src/main/java" />
-      </sources>
-      <targets>
-        <fileset dir="${antlr-rt.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${antlr-rt.dir}/antlr-3.4/runtime/Java/src/main/java"
       destdir="${antlr-rt.build.outdir}"
       source="1.6" target="1.6"
@@ -1143,15 +964,6 @@
     <mkdir dir="${allocation.build.outdir}"/>
     <mkdir dir="${allocation.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${allocation.dir}/src/main/java" />
-      </sources>
-      <targets>
-        <fileset dir="${allocation.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${allocation.dir}/src/main/java"
       destdir="${allocation.build.outdir}"
       source="1.6" target="1.6"
@@ -1187,15 +999,6 @@
     <mkdir dir="${junit4.build.outdir}"/>
     <mkdir dir="${junit4.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${junit4.dir}/src/main/java" />
-      </sources>
-      <targets>
-        <fileset dir="${junit4.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${junit4.dir}/src/main/java"
         destdir="${junit4.build.outdir}"
         source="1.6" target="1.6"
@@ -1232,9 +1035,11 @@
     <copy todir="${junit4.exec.build.outdir}">
       <fileset dir="${junit4.build.outdir}" includes="**/*.class" />
     </copy>
-    <copy todir="${junit4.exec.build.outdir}">
-      <fileset dir="${hamcrest-core.build.outdir}"/>
-    </copy>
+    <unzip dest="${junit4.exec.build.outdir}">
+      <filelist dir="/">
+        <file name="${hamcrest-core.dist.dir}/${hamcrest-core.libname}" />
+      </filelist>
+    </unzip>
     <jar destfile="${junit4.dist.dir}/${junit4.execname}"
         basedir="${junit4.exec.build.outdir}"
         includes="**"/>
@@ -1289,15 +1094,6 @@
     <mkdir dir="${hamcrest-core.build.outdir}"/>
     <mkdir dir="${hamcrest-core.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${hamcrest-core.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${hamcrest-core.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${hamcrest-core.dir}/src"
           destdir="${hamcrest-core.build.outdir}"
           source="1.6" target="1.6"
@@ -1368,15 +1164,6 @@
       </filelist>
     </copy>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${dexcomparator.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${dexcomparator.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${dexcomparator.dir}/src"
             destdir="${dexcomparator.build.outdir}"
             source="1.6" target="1.6"
@@ -1425,25 +1212,15 @@
     <delete dir="${dexlib.dist.dir}" />
   </target>
 
-  <target name="dex-lib-compile" depends="guava-lib,jsr305-lib">
+  <target name="dex-lib" depends="guava-lib,jsr305-lib">
     <!-- project layout -->
     <mkdir dir="${dexlib.build.outdir}"/>
     <mkdir dir="${dexlib.dist.dir}"/>
     <!-- compile -->
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${dexlib.dir}/src/main/java" />
-      </sources>
-      <targets>
-        <fileset dir="${dexlib.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${dexlib.dir}/src/main/java"
             destdir="${dexlib.build.outdir}"
             source="1.6" target="1.6"
-            debug="true" includeantruntime="false"  includeDestClasses="false" nowarn="true"
-            updatedproperty="dexlib.updated">
+            debug="true" includeantruntime="false"  includeDestClasses="false" nowarn="true">
       <classpath>
         <filelist dir="/">
           <file name="${guava.dist.dir}/${guava.libname}"/>
@@ -1451,9 +1228,6 @@
         </filelist>
       </classpath>
     </javac>
-  </target>
-
-  <target name="dex-lib" depends="dex-lib-compile" if="dexlib.updated" >
     <!-- generate dexlib.properties -->
     <echo message="application.version=${dexlib.version}"
            file="${dexlib.build.outdir}/dexlib.properties"/>
@@ -1491,15 +1265,6 @@
       <arg value="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}"/>
       <arg value="${core-stubs-mini.dir}/src"/>
     </java>
-    <dependset>
-      <sources>
-        <!-- All source files -->
-          <fileset dir="${core-stubs-mini.dir}/src" />
-      </sources>
-      <targets>
-        <fileset dir="${core-stubs-mini.build.outdir}"/>
-      </targets>
-    </dependset>
     <javac srcdir="${core-stubs-mini.dir}/src"
       destdir="${core-stubs-mini.build.outdir}"
       source="1.6" target="1.6" debug="true" includeantruntime="false"  includeDestClasses="false"