72766 - improved build.xml for building the testcode jar

diff --git a/tests/java5/annotations/build.xml b/tests/java5/annotations/build.xml
index 7170813dc9bc83fffad0fac5529aff99a8dfecaf..86a30e6ab66b1684dd9bedc1e9f06bf970de8001 100644 (file)
--- a/tests/java5/annotations/build.xml
+++ b/tests/java5/annotations/build.xml
@@ -3,8 +3,9 @@
     <target name="default">
        <delete dir="output" failonerror="false"/>
        <mkdir dir="output"/>
-       <javac destdir="output" debug="on" srcdir="." includes="*.java"/>
-       <zip file="testcode.jar" basedir="output" includes="*"/>
+       <javac destdir="output" debug="on" srcdir="." includes="SimpleAnnotation.java"/>
+       <javac destdir="output" debug="on" srcdir="." includes="Annotation.java"/>
+       <zip file="testcode.jar" basedir="output" includes="**/*"/>
        <delete dir="output"/>
     </target>
 

diff --git a/tests/java5/enums/Enum.java b/tests/java5/enums/Enum.java
index e8e0e72c0e579d91eda3231fb73fabeede81f865..b0478932033d2357d7d84b2e1960c0f66c946acf 100644 (file)
--- a/tests/java5/enums/Enum.java
+++ b/tests/java5/enums/Enum.java
@@ -1,3 +1,3 @@
-package java.lang;
+package java.lang; // Fake class to keep 1.4 JVM (that will be running the tests) happy
 public class Enum {
 }

diff --git a/tests/java5/enums/build.xml b/tests/java5/enums/build.xml
index 2d71e22c78f20b462a0cb9b89aada9acaf070ac9..3f95a0b25d3074939b8953d0baa16b83b4ce8bd9 100644 (file)
--- a/tests/java5/enums/build.xml
+++ b/tests/java5/enums/build.xml
@@ -1,22 +1,12 @@
 <project name="Java 5 compilation of test source" default="default" basedir=".">
 
-  <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
-    <classpath>
-      <pathelement location="c:/aspectj1.2/lib/aspectjtools.jar"/>
-    </classpath>
-  </taskdef>
-
-
-    <target name="default" depends="aspect_jars">
+    <target name="default" >
        <delete dir="output" failonerror="false"/>
        <mkdir dir="output"/>
-       <javac destdir="output" debug="on" srcdir="." includes="*.java"/>
-       <zip file="testcode.jar" basedir="output" includes="*"/>
+       <javac destdir="output" debug="on" srcdir="." includes="SimpleEnum.java"/>
+       <javac destdir="output" debug="on" srcdir="." includes="Enum.java"/>
+       <zip file="testcode.jar" basedir="output" includes="**/*"/>
        <delete dir="output"/>
     </target>
 
-  <target name="aspect_jars">
-      <iajc outjar="EnumAspect01.jar" srcdir="." includes="EnumAspect01.aj" classpath="c:/aspectj1.2/lib/aspectjrt.jar"/>
-  </target>
-
 </project>