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 /loadtime5 | |
| parent | 79d3b2f57fab5ac2d63d402ee8c226082c872064 (diff) | |
| download | aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.tar.gz aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.zip | |
newbuild.xml replacing build.xml, with Alex ok
Diffstat (limited to 'loadtime5')
| -rw-r--r-- | loadtime5/build.xml | 48 | ||||
| -rw-r--r-- | loadtime5/newbuild.xml | 6 |
2 files changed, 3 insertions, 51 deletions
diff --git a/loadtime5/build.xml b/loadtime5/build.xml index 41c07c1f1..a2a3e6243 100644 --- a/loadtime5/build.xml +++ b/loadtime5/build.xml @@ -1,48 +1,6 @@ <?xml version="1.0"?> -<project name="loadtime5" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../asm/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../loadtime/build.xml"/> - <import file="../weaver/build.xml"/> - <import file="../util/build.xml"/> - <import file="../runtime/build.xml/"/> - <import file="../aspectj5rt/build.xml"/> - - <path id="loadtime5.src.path"> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../loadtime/bin"/> - <pathelement path="../weaver/bin"/> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - </fileset> - </path> - - <target name="compile" depends="init, - asm.compile, - bridge.compile, - loadtime.compile, - weaver.compile" if="jdk15"> - <!-- FIXME: we override compile due to use of 1.5 --> - <mkdir dir="${basedir}/bin"/> - <javac debug="on" destdir="${basedir}/bin" source="1.5" target="1.5"> - <src path="${basedir}/java5-src"/> - <classpath refid="loadtime5.src.path"/> - </javac> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/loadtime5.jar"/> - <copy file="loadtime5.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/loadtime5.jar" manifest="${build.ajdir}/temp/loadtime5.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - <!-- FIXME AV we can push it to lib/test as well for the AntSpec need --> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="loadtime5" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/loadtime5/newbuild.xml b/loadtime5/newbuild.xml deleted file mode 100644 index a2a3e6243..000000000 --- a/loadtime5/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="loadtime5" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - |