diff options
| author | aclement <aclement> | 2004-12-02 10:49:25 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2004-12-02 10:49:25 +0000 |
| commit | 489e9a0aff588c158b3b1c8555307affbd87a1eb (patch) | |
| tree | 093570b899f4281402a5c79ddf4a9c6ceafaa6f4 /tests | |
| parent | 01ffc36816f112b7bd9ec25cf842c598cb58fb87 (diff) | |
| download | aspectj-489e9a0aff588c158b3b1c8555307affbd87a1eb.tar.gz aspectj-489e9a0aff588c158b3b1c8555307affbd87a1eb.zip | |
72766 - improved build.xml for building the testcode jar
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/java5/annotations/build.xml | 5 | ||||
| -rw-r--r-- | tests/java5/enums/Enum.java | 2 | ||||
| -rw-r--r-- | tests/java5/enums/build.xml | 18 |
3 files changed, 8 insertions, 17 deletions
diff --git a/tests/java5/annotations/build.xml b/tests/java5/annotations/build.xml index 7170813dc..86a30e6ab 100644 --- 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 e8e0e72c0..b04789320 100644 --- 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 2d71e22c7..3f95a0b25 100644 --- 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> |