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 /taskdefs | |
| parent | 79d3b2f57fab5ac2d63d402ee8c226082c872064 (diff) | |
| download | aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.tar.gz aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.zip | |
newbuild.xml replacing build.xml, with Alex ok
Diffstat (limited to 'taskdefs')
| -rw-r--r-- | taskdefs/build.xml | 64 | ||||
| -rw-r--r-- | taskdefs/newbuild.xml | 6 |
2 files changed, 3 insertions, 67 deletions
diff --git a/taskdefs/build.xml b/taskdefs/build.xml index 81dda6c88..c25c6e792 100644 --- a/taskdefs/build.xml +++ b/taskdefs/build.xml @@ -1,64 +1,6 @@ <?xml version="1.0"?> -<project name="taskdefs" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../bridge/build.xml"/> - <import file="../org.aspectj.ajdt.core/build.xml"/> - - <path id="taskdefs.test.src.path"> - <path refid="taskdefs.src.path"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <!-- below: needed for test run but not test:compile --> - <pathelement path="../weaver/bin"/> - <pathelement path="../asm/bin"/> - <pathelement path="../runtime/bin"/> - <fileset dir="${basedir}/../org.eclipse.jdt.core"> - <include name="*.jar"/> - </fileset> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - </fileset> - </path> - - <path id="taskdefs.src.path"> - <pathelement path="../bridge/bin"/> - <pathelement path="../org.aspectj.ajdt.core/bin"/> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - bridge.compile, - org.aspectj.ajdt.core.compile, - util.compile"> - <srccompile project="taskdefs" path="taskdefs.src.path"/> - <!-- copy resources --> - <copy todir="../taskdefs/bin"> - <fileset dir="../taskdefs/src" includes="**/*.properties"/> - </copy> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="taskdefs" path="taskdefs.test.src.path"/> - </target> - - <target name="test" depends="test:compile, - asm.compile, - org.aspectj.ajdt.core.compile, - runtime.compile, - weaver.compile"> - <testrun project="taskdefs" path="taskdefs.test.src.path" suite="TaskdefsModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/taskdefs.jar"/> - <zip destfile="${build.ajdir}/jars/taskdefs.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </zip> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="taskdefs" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/taskdefs/newbuild.xml b/taskdefs/newbuild.xml deleted file mode 100644 index c25c6e792..000000000 --- a/taskdefs/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="taskdefs" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - |