diff options
| author | wisberg <wisberg> | 2005-05-19 03:48:09 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2005-05-19 03:48:09 +0000 |
| commit | 2afa9c9148da8566562ef029b9a5d6b5f141763c (patch) | |
| tree | e0c62bcb64d8a9884639743298b23eda89cf96cb /aspectj5rt | |
| parent | 79d3b2f57fab5ac2d63d402ee8c226082c872064 (diff) | |
| download | aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.tar.gz aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.zip | |
newbuild.xml replacing build.xml, with Alex ok
Diffstat (limited to 'aspectj5rt')
| -rw-r--r-- | aspectj5rt/build.xml | 52 | ||||
| -rw-r--r-- | aspectj5rt/newbuild.xml | 6 |
2 files changed, 3 insertions, 55 deletions
diff --git a/aspectj5rt/build.xml b/aspectj5rt/build.xml index fc7d5a68f..a20401a21 100644 --- a/aspectj5rt/build.xml +++ b/aspectj5rt/build.xml @@ -1,52 +1,6 @@ <?xml version="1.0"?> -<project name="aspectj5rt" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../runtime/build.xml"/> - - <path id="aspectj5rt.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="aspectj5rt.src.path"/> - </path> - - <path id="aspectj5rt.src.path"> - <pathelement path="../runtime/bin"/> - </path> - - <target name="compile" if="jdk15" depends="init, - runtime.compile"> - <!-- FIXME: we override compile due to use of java5-src instead of src.. and source/target attrs --> - <mkdir dir="../aspectj5rt/bin"/> - <javac debug="on" destdir="../aspectj5rt/bin" source="1.5" target="1.5"> - <src path="../aspectj5rt/java5-src"/> - <classpath refid="aspectj5rt.src.path"/> - </javac> - </target> - - <target name="test:compile" depends="compile" if="jdk15"> - <mkdir dir="../aspectj5rt/bintest"/> - <javac debug="on" destdir="../aspectj5rt/bintest" source="1.5" target="1.5"> - <src path="../aspectj5rt/java5-testsrc"/> - <classpath refid="aspectj5rt.test.src.path"/> - <classpath path="../aspectj5rt/bin"/> - </javac> - </target> - - <target name="test" depends="test:compile" if="jdk15"> - <testrun project="aspectj5rt" path="aspectj5rt.test.src.path" suite="Aspectj5rtModuleTests"/> - </target> - - <target name="jar" depends="compile" if="jdk15"> - <delete file="${build.ajdir}/jars/aspectj5rt.jar"/> - <copy file="aspectj5rt.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/aspectj5rt.jar" manifest="${build.ajdir}/temp/aspectj5rt.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="aspectj5rt" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/aspectj5rt/newbuild.xml b/aspectj5rt/newbuild.xml deleted file mode 100644 index a20401a21..000000000 --- a/aspectj5rt/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="aspectj5rt" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - |