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 /ajdoc | |
| parent | 79d3b2f57fab5ac2d63d402ee8c226082c872064 (diff) | |
| download | aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.tar.gz aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.zip | |
newbuild.xml replacing build.xml, with Alex ok
Diffstat (limited to 'ajdoc')
| -rw-r--r-- | ajdoc/build.xml | 74 | ||||
| -rw-r--r-- | ajdoc/newbuild.xml | 6 |
2 files changed, 3 insertions, 77 deletions
diff --git a/ajdoc/build.xml b/ajdoc/build.xml index c3812e898..f8db6b9c4 100644 --- a/ajdoc/build.xml +++ b/ajdoc/build.xml @@ -1,74 +1,6 @@ <?xml version="1.0"?> -<project name="ajdoc" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../asm/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../org.aspectj.ajdt.core/build.xml"/> - - <path id="ajdoc.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="ajdoc.src.path"/> - <!-- test run --> - <pathelement path="../runtime/bin"/> - <pathelement path="../weaver/bin"/> - <fileset dir="${basedir}/../org.eclipse.jdt.core"> - <include name="*.jar"/> - </fileset> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - </fileset> - <fileset dir="${java.home}/../lib"> - <include name="tools.jar"/> - </fileset> - </path> - - <path id="ajdoc.src.path"> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../org.aspectj.ajdt.core/bin"/> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - asm.compile, - bridge.compile, - org.aspectj.ajdt.core.compile, - util.compile"> - <srccompile project="ajdoc" path="ajdoc.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="ajdoc" path="ajdoc.test.src.path"/> - </target> - - <target name="test" depends="test:compile, - runtime.compile, - weaver.compile"> - <testrun project="ajdoc" path="ajdoc.test.src.path" suite="AjdocModuleTests"/> - </target> - - <!-- override to remove generated doc directories --> - <target name="cleanall" depends="init"> - <delete dir="${basedir}/ajdocworkingdir"/> - <delete dir="${basedir}/bintest"/> - <delete> - <fileset dir="${basedir}/testdata" includes="*/doc/**/*"/> - <fileset dir="${basedir}/testdata" includes="*/docdir/**/*"/> - </delete> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/ajdoc.jar"/> - <copy file="ajdoc.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/ajdoc.jar" manifest="${build.ajdir}/temp/ajdoc.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="ajdoc" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/ajdoc/newbuild.xml b/ajdoc/newbuild.xml deleted file mode 100644 index f8db6b9c4..000000000 --- a/ajdoc/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="ajdoc" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - |