diff options
36 files changed, 54 insertions, 1099 deletions
diff --git a/ajbrowser/build.xml b/ajbrowser/build.xml index 2728bd418..efd61050d 100644 --- a/ajbrowser/build.xml +++ b/ajbrowser/build.xml @@ -1,50 +1,6 @@ <?xml version="1.0"?> -<project name="ajbrowser" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../ajde/build.xml"/> - <import file="../asm/build.xml"/> - <import file="../bridge/build.xml"/> - - <path id="ajbrowser.test.src.path"> - <path refid="ajbrowser.src.path"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - </path> - - <path id="ajbrowser.src.path"> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../ajde/bin"/> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - ajde.compile, - asm.compile, - bridge.compile, - util.compile"> - <srccompile project="ajbrowser" path="ajbrowser.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="ajbrowser" path="ajbrowser.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="ajbrowser" path="ajbrowser.test.src.path" suite="AjbrowserModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/ajbrowser.jar"/> - <copy file="ajbrowser.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/ajbrowser.jar" manifest="${build.ajdir}/temp/ajbrowser.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="ajbrowser" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/ajbrowser/newbuild.xml b/ajbrowser/newbuild.xml deleted file mode 100644 index efd61050d..000000000 --- a/ajbrowser/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="ajbrowser" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/ajde/build.xml b/ajde/build.xml index 33dba5c08..783410312 100644 --- a/ajde/build.xml +++ b/ajde/build.xml @@ -1,62 +1,6 @@ <?xml version="1.0"?> -<project name="ajde" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../runtime/build.xml"/> - <import file="../org.aspectj.ajdt.core/build.xml"/> - - <path id="ajde.test.src.path"> - <path refid="ajde.src.path"/> - <pathelement path="../org.aspectj.ajdt.core/bintest"/> - <pathelement path="../weaver/bin"/> - <pathelement path="../runtime/bin"/> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - <include name="junit/*.jar"/> - </fileset> - </path> - - <path id="ajde.src.path"> - <fileset dir="${basedir}/../org.eclipse.jdt.core"> - <include name="*.jar"/> - </fileset> - <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="ajde" path="ajde.src.path"/> - <!-- copy resources --> - <copy todir="../ajde/bin"> - <fileset dir="../ajde/src" includes="**/*.gif"/> - </copy> - </target> - - <target name="test:compile" depends="compile, - org.aspectj.ajdt.core.test:compile, - weaver.test:compile"> - <testcompile project="ajde" path="ajde.test.src.path"/> - </target> - - <target name="test" depends="test:compile, - runtime.compile"> - <testrun project="ajde" path="ajde.test.src.path" suite="AjdeModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/ajde.jar"/> - <zip destfile="${build.ajdir}/jars/ajde.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </zip> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="ajde" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/ajde/newbuild.xml b/ajde/newbuild.xml deleted file mode 100644 index 783410312..000000000 --- a/ajde/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="ajde" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - 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> - diff --git a/asm/build.xml b/asm/build.xml index 3057e9262..d6a9c197c 100644 --- a/asm/build.xml +++ b/asm/build.xml @@ -1,40 +1,6 @@ <?xml version="1.0"?> -<project name="asm" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../bridge/build.xml"/> - - <path id="asm.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="asm.src.path"/> - </path> - - <path id="asm.src.path"> - <pathelement path="../bridge/bin"/> - </path> - - <target name="compile" depends="init, - bridge.compile"> - <srccompile project="asm" path="asm.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="asm" path="asm.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="asm" path="asm.test.src.path" suite="AsmModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/asm.jar"/> - <zip destfile="${build.ajdir}/jars/asm.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </zip> - </target> +<!-- see ../build/*.html for explanation --> +<project name="asm" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/asm/newbuild.xml b/asm/newbuild.xml deleted file mode 100644 index d6a9c197c..000000000 --- a/asm/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="asm" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - 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> - diff --git a/bridge/build.xml b/bridge/build.xml index ebd236b77..349b0aa8c 100644 --- a/bridge/build.xml +++ b/bridge/build.xml @@ -1,41 +1,6 @@ <?xml version="1.0"?> -<project name="bridge" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../util/build.xml"/> - - <path id="bridge.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="bridge.src.path"/> - </path> - - <path id="bridge.src.path"> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - util.compile"> - <srccompile project="bridge" path="bridge.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="bridge" path="bridge.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="bridge" path="bridge.test.src.path" suite="BridgeModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/bridge.jar"/> - <zip destfile="${build.ajdir}/jars/bridge.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </zip> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="bridge" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/bridge/newbuild.xml b/bridge/newbuild.xml deleted file mode 100644 index 349b0aa8c..000000000 --- a/bridge/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="bridge" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/loadtime/build.xml b/loadtime/build.xml index dbdfa8ef6..5d64fdfce 100644 --- a/loadtime/build.xml +++ b/loadtime/build.xml @@ -1,62 +1,6 @@ <?xml version="1.0"?> -<project name="loadtime" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../asm/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../util/build.xml"/> - <import file="../weaver/build.xml"/> - - - <path id="loadtime.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="loadtime.src.path"/> - </path> - - <path id="loadtime.src.path"> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../util/bin"/> - <pathelement path="../weaver/bin"/> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - </fileset> - </path> - - <target name="compile" depends="init, - asm.compile, - bridge.compile, - util.compile, - weaver.compile"> - <srccompile project="loadtime" path="loadtime.src.path"/> - <!-- copy resources --> - <copy todir="../loadtime/bin"> - <fileset dir="../loadtime/src" includes="**/*.dtd"/> - </copy> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="loadtime" path="loadtime.src.path"/> - <!-- copy resources --> - <copy todir="../loadtime/bin"> - <fileset dir="../loadtime/testsrc" includes="**/*.xml"/> - </copy> - </target> - - <target name="test" depends="test:compile"> - <testrun project="loadtime" path="loadtime.test.src.path" suite="LoadtimeModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/loadtime.jar"/> - <jar destfile="${build.ajdir}/jars/loadtime.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="loadtime" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/loadtime/newbuild.xml b/loadtime/newbuild.xml deleted file mode 100644 index 5d64fdfce..000000000 --- a/loadtime/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="loadtime" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - 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> - diff --git a/org.aspectj.ajdt.core/build.xml b/org.aspectj.ajdt.core/build.xml index 224c3eea5..8765d7548 100644 --- a/org.aspectj.ajdt.core/build.xml +++ b/org.aspectj.ajdt.core/build.xml @@ -1,69 +1,6 @@ <?xml version="1.0"?> -<project name="org.aspectj.ajdt.core" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../runtime/build.xml"/> - <import file="../asm/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../util/build.xml"/> - <import file="../weaver/build.xml"/> - <import file="../testing-util/build.xml"/> - - <path id="org.aspectj.ajdt.core.test.src.path"> - <path refid="org.aspectj.ajdt.core.src.path"/> - <pathelement path="../testing-util/bin"/> - <pathelement path="../weaver/bintest"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - <include name="jdiff/*.jar"/> - </fileset> - </path> - - <path id="org.aspectj.ajdt.core.src.path"> - <fileset dir="${basedir}/../org.eclipse.jdt.core"> - <include name="*.jar"/> - </fileset> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - </fileset> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../runtime/bin"/> - <pathelement path="../util/bin"/> - <pathelement path="../weaver/bin"/> - </path> - - <target name="compile" depends="init, - asm.compile, - bridge.compile, - runtime.compile, - util.compile, - weaver.compile"> - <srccompile project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.src.path"/> - <!-- copy resources --> - <copy todir="../org.aspectj.ajdt.core/bin"> - <fileset dir="../org.aspectj.ajdt.core/src" includes="**/*.properties"/> - </copy> - </target> - - <target name="test:compile" depends="compile, - testing-util.compile, - weaver.test:compile"> - <testcompile project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.test.src.path" suite="EajcModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/org.aspectj.ajdt.core.jar"/> - <zip destfile="${build.ajdir}/jars/org.aspectj.ajdt.core.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </zip> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="org.aspectj.ajdt.core" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/org.aspectj.ajdt.core/newbuild.xml b/org.aspectj.ajdt.core/newbuild.xml deleted file mode 100644 index 8765d7548..000000000 --- a/org.aspectj.ajdt.core/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="org.aspectj.ajdt.core" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/run-all-junit-tests/build.xml b/run-all-junit-tests/build.xml index 9fbf00812..5afbd5589 100644 --- a/run-all-junit-tests/build.xml +++ b/run-all-junit-tests/build.xml @@ -1,111 +1,6 @@ <?xml version="1.0"?> -<project name="run-all-junit-tests" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../ajbrowser/build.xml"/> - <import file="../ajde/build.xml"/> - <import file="../asm/build.xml"/> - <import file="../aspectj5rt/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../org.aspectj.ajdt.core/build.xml"/> - <import file="../runtime/build.xml"/> - <import file="../taskdefs/build.xml"/> - <import file="../testing/build.xml"/> - <import file="../testing-drivers/build.xml"/> - <import file="../tests/build.xml"/> - <import file="../util/build.xml"/> -<!-- <import file="../ajde/build.xml"/>--> -<!-- <import file="../asm/build.xml"/>--> -<!-- <import file="../bridge/build.xml"/>--> -<!-- <import file="../testing/build.xml"/>--> - - <path id="run-all-junit-tests.test.src.path"> -<!-- <path refid="run-all-junit-tests.src.path"/>--> - <pathelement path="../ajde/bintest"/> - <pathelement path="../ajde/bin"/> - <pathelement path="../ajbrowser/bintest"/> - <pathelement path="../ajbrowser/bin"/> - <pathelement path="../asm/bintest"/> - <pathelement path="../asm/bin"/> - <pathelement path="../aspectj5rt/bintest"/> - <pathelement path="../aspectj5rt/bin"/> - <pathelement path="../bridge/bintest"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../org.aspectj.ajdt.core/bintest"/> - <pathelement path="../org.aspectj.ajdt.core/bin"/> - <pathelement path="../taskdefs/bintest"/> - <pathelement path="../taskdefs/bin"/> - <pathelement path="../runtime/bintest"/> - <pathelement path="../runtime/bin"/> - <pathelement path="../testing/bintest"/> - <pathelement path="../testing/bin"/> - <pathelement path="../testing-drivers/bintest"/> - <pathelement path="../testing-drivers/bin"/> - <pathelement path="../testing-util/bintest"/> - <pathelement path="../testing-util/bin"/> - <pathelement path="../tests/bin"/> - <pathelement path="../util/bintest"/> - <pathelement path="../util/bin"/> - <!-- below are libs / deps required for test run --> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - <include name="ant/lib/*.jar"/> - <include name="commons/*.jar"/> - <include name="bcel/*.jar"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.jdt.core"> - <include name="*.jar"/> - </fileset> - <pathelement path="../weaver/bin"/> - <pathelement path="../weaver/bintest"/> - </path> - - <path id="run-all-junit-tests.src.path"> - </path> - - <target name="compile" depends="init"> - <!-- empty - no src/ here --> - </target> - - <target name="test:compile" depends="compile, - ajbrowser.compile, - ajbrowser.test:compile, - ajde.compile, - ajde.test:compile, - asm.compile, - asm.test:compile, - aspectj5rt.compile, - bridge.compile, - bridge.test:compile, - org.aspectj.ajdt.core.compile, - org.aspectj.ajdt.core.test:compile, - runtime.compile, - runtime.test:compile, - taskdefs.compile, - taskdefs.test:compile, - testing.compile, - testing.test:compile, - testing-drivers.compile, - testing-drivers.test:compile, - testing-util.compile, - testing-util.test:compile, - tests.compile, - util.compile, - util.test:compile, - weaver.compile, - weaver.test:compile"> - <ant antfile="../aspectj5rt/build.xml" target="test:compile"/> - <testcompile project="run-all-junit-tests" path="run-all-junit-tests.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="run-all-junit-tests" path="run-all-junit-tests.test.src.path" - suite="RunTheseBeforeYouCommitTests"/> - </target> - - <target name="clean"> - - </target> - +<!-- see ../build/*.html for explanation --> +<project name="run-all-junit-tests" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/run-all-junit-tests/newbuild.xml b/run-all-junit-tests/newbuild.xml deleted file mode 100644 index 5afbd5589..000000000 --- a/run-all-junit-tests/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="run-all-junit-tests" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/runtime/build.xml b/runtime/build.xml index 6ddcc7828..2102111ef 100644 --- a/runtime/build.xml +++ b/runtime/build.xml @@ -1,56 +1,6 @@ <?xml version="1.0"?> -<project name="runtime" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - - <path id="runtime.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="runtime.src.path"/> - </path> - - <path id="runtime.src.path"> - </path> - - <target name="compile" depends="init, compile:jdk13, compile:residual"> - <!-- don't use the Ant macro srccompile that is Java 1.3 level --> - <!-- use an indirection level since Java 5 does not accept -source 1.1 anymore --> - <!-- under Java 5 we will only ensure source 1.2 --> - </target> - <target name="compile:jdk13" if="jdk13"> - <!-- Note: note sure we can trust that. Pbly better if CruiseControl runs with a real 1.1 for this module --> - <!-- f.e. use a TreeMap (@since Java 1.2) somewhere, and it still compiles.. --> - <mkdir dir="../runtime/bin"/> - <javac debug="on" destdir="../runtime/bin" source="1.1" target="1.1"> - <src path="../runtime/src"/> - <classpath refid="runtime.src.path"/> - </javac> - </target> - <target name="compile:residual"> - <srccompile project="runtime" path="runtime.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <!-- TODO AV do we want to run them on 1.1 ? --> - <testcompile project="runtime" path="runtime.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="runtime" path="runtime.test.src.path" suite="RuntimeModuleTests"/> - </target> - - <target name="all" depends="init, compile, test:compile"/> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/runtime.jar"/> - <copy file="runtime.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/runtime.jar" manifest="${build.ajdir}/temp/runtime.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="runtime" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/runtime/newbuild.xml b/runtime/newbuild.xml deleted file mode 100644 index 2102111ef..000000000 --- a/runtime/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="runtime" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - 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> - diff --git a/testing-client/build.xml b/testing-client/build.xml index 8f9e8d4ad..171c92589 100644 --- a/testing-client/build.xml +++ b/testing-client/build.xml @@ -1,35 +1,6 @@ <?xml version="1.0"?> -<project name="testing-client" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../bridge/build.xml"/> - - <path id="testing-client.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="testing-client.src.path"/> - </path> - - <path id="testing-client.src.path"> - <pathelement path="../bridge/bin"/> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - bridge.compile, - util.compile"> - <srccompile project="testing-client" path="testing-client.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="testing-client" path="testing-client.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="testing-client" path="testing-client.test.src.path" suite="TestingClientModuleTests"/> - </target> - - +<!-- see ../build/*.html for explanation --> +<project name="testing-client" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/testing-client/newbuild.xml b/testing-client/newbuild.xml deleted file mode 100644 index 171c92589..000000000 --- a/testing-client/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="testing-client" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/testing-drivers/build.xml b/testing-drivers/build.xml index 0da9f8d69..f7cff0755 100644 --- a/testing-drivers/build.xml +++ b/testing-drivers/build.xml @@ -1,60 +1,6 @@ <?xml version="1.0"?> -<project name="testing-drivers" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../ajde/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../taskdefs/build.xml"/> - <import file="../testing/build.xml"/> - - <path id="testing-drivers.test.src.path"> - <path refid="testing-drivers.src.path"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - <include name="commons/*.jar"/> - </fileset> - <!-- test run --> - <pathelement path="../ajde/bin"/> - <pathelement path="../asm/bin"/> - <pathelement path="../org.aspectj.ajdt.core/bin"/> - <pathelement path="../runtime/bin"/> - <pathelement path="../taskdefs/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> - </path> - - <path id="testing-drivers.src.path"> - <pathelement path="../bridge/bin"/> - <pathelement path="../testing/bin"/> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - bridge.compile, - testing.compile, - util.compile"> - <srccompile project="testing-drivers" path="testing-drivers.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="testing-drivers" path="testing-drivers.test.src.path"/> - </target> - - <target name="test" depends="test:compile, - ajde.compile, - asm.compile, - org.aspectj.ajdt.core.compile, - runtime.compile, - taskdefs.compile, - weaver.compile"> - <testrun project="testing-drivers" path="testing-drivers.test.src.path" suite="TestingDriversModuleTests"/> - </target> - - +<!-- see ../build/*.html for explanation --> +<project name="testing-drivers" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/testing-drivers/newbuild.xml b/testing-drivers/newbuild.xml deleted file mode 100644 index f7cff0755..000000000 --- a/testing-drivers/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="testing-drivers" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/testing-util/build.xml b/testing-util/build.xml index f5c57973e..804ea5091 100644 --- a/testing-util/build.xml +++ b/testing-util/build.xml @@ -1,47 +1,6 @@ <?xml version="1.0"?> -<project name="testing-util" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../bridge/build.xml"/> - <import file="../util/build.xml"/> - <import file="../runtime/build.xml"/> - - - <path id="testing-util.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - <include name="bcel/*.jar"/> - </fileset> - <!-- depends on weaver to use Dissasemble feature on LazyClassGen to test comparison of .class file --> - <pathelement path="../weaver/bin"/> - <pathelement path="../runtime/bin"/> - <path refid="testing-util.src.path"/> - </path> - - <path id="testing-util.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="jdiff/*.jar"/> - </fileset> - <pathelement path="../bridge/bin"/> - <pathelement path="../util/bin"/> - </path> - - <target name="compile" depends="init, - bridge.compile, - util.compile"> - <srccompile project="testing-util" path="testing-util.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="testing-util" path="testing-util.test.src.path"/> - </target> - - <target name="test" depends="test:compile, - runtime.compile"> - <!-- depends on weaver to access .class dissassemble utility hence circular --> - <subant antfile="build.xml" target="test:compile" buildpath="../weaver" /> - <testrun project="testing-util" path="testing-util.test.src.path" suite="TestingUtilModuleTests"/> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="testing-util" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/testing-util/newbuild.xml b/testing-util/newbuild.xml deleted file mode 100644 index 804ea5091..000000000 --- a/testing-util/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="testing-util" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/testing/build.xml b/testing/build.xml index 5bd931aa5..4a7a25ae3 100644 --- a/testing/build.xml +++ b/testing/build.xml @@ -1,74 +1,6 @@ <?xml version="1.0"?> -<project name="testing" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../ajde/build.xml"/> - <import file="../bridge/build.xml"/> - <import file="../taskdefs/build.xml"/> - <import file="../testing-client/build.xml"/> - - <path id="testing.test.src.path"> - <path refid="testing.src.path"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <!-- for test run --> - <pathelement path="../org.aspectj.ajdt.core/bin"/> - <pathelement path="../weaver/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="testing.src.path"> - <pathelement path="../ajde/bin"/> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../taskdefs/bin"/> - <pathelement path="../testing-client/bin"/> - <pathelement path="../testing-util/bin"/> - <pathelement path="../util/bin"/> - <fileset dir="${basedir}/../lib"> - <include name="commons/*.jar"/> - </fileset> - <!-- for newsrc --> - <pathelement path="../org.aspectj.ajdt.core/bintest"/> - </path> - - <target name="compile" depends="init, - ajde.compile, - asm.compile, - bridge.compile, - taskdefs.compile, - testing-client.compile, - testing-util.compile, - util.compile"> - <srccompile project="testing" path="testing.src.path"/> - <!-- newsrc depends on ajdt.test:compile and we cannot use a depends for it due to the way - Ant manage overrides thru <import --> - <testcompile project="weaver" path="weaver.test.src.path"/> - <testcompile project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.test.src.path"/> - <javac debug="on" destdir="../testing/bin" source="1.2" target="1.1"> - <src path="../testing/newsrc"/> - <classpath refid="testing.src.path"/> - <classpath path="../org.aspectj.ajdt.core/bintest"/> - </javac> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="testing" path="testing.test.src.path"/> - </target> - - <target name="test" depends="test:compile, - org.aspectj.ajdt.core.compile, - weaver.compile, - runtime.compile"> - <testrun project="testing" path="testing.test.src.path" suite="TestingModuleTests"/> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="testing" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/testing/newbuild.xml b/testing/newbuild.xml deleted file mode 100644 index 4a7a25ae3..000000000 --- a/testing/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="testing" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/util/build.xml b/util/build.xml index 7618057ab..05bdade88 100644 --- a/util/build.xml +++ b/util/build.xml @@ -1,38 +1,6 @@ <?xml version="1.0"?> -<project name="util" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - - <path id="util.test.src.path"> - <path refid="util.src.path"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - </path> - - <path id="util.src.path"> - </path> - - <target name="compile" depends="init"> - <srccompile project="util" path="util.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <testcompile project="util" path="util.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="util" path="util.test.src.path" suite="UtilModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/util.jar"/> - <zip destfile="${build.ajdir}/jars/util.jar"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </zip> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="util" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/util/newbuild.xml b/util/newbuild.xml deleted file mode 100644 index 05bdade88..000000000 --- a/util/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="util" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/weaver/build.xml b/weaver/build.xml index ac52e5f13..46f8ca401 100644 --- a/weaver/build.xml +++ b/weaver/build.xml @@ -1,62 +1,6 @@ <?xml version="1.0"?> -<project name="weaver" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - <import file="../asm/build.xml"/> - <import file="../runtime/build.xml"/> - <import file="../util/build.xml"/> - <import file="../testing-util/build.xml"/> - - <path id="weaver.test.src.path"> - <pathelement path="../testing-util/bin"/> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - <include name="jdiff/*.jar"/> - </fileset> - <path refid="weaver.src.path"/> - </path> - - <path id="weaver.src.path"> - <pathelement path="../asm/bin"/> - <pathelement path="../bridge/bin"/> - <pathelement path="../runtime/bin"/> - <pathelement path="../util/bin"/> - <fileset dir="${basedir}/../lib"> - <include name="bcel/*.jar"/> - </fileset> - </path> - - <target name="compile" depends="init, - asm.compile, - bridge.compile, - runtime.compile, - util.compile"> - <srccompile project="weaver" path="weaver.src.path"/> - <!-- copy resources --> - <copy todir="../weaver/bin"> - <fileset dir="../weaver/src" includes="**/*.properties"/> - </copy> - </target> - - <target name="test:compile" depends="compile, - testing-util.compile"> - <testcompile project="weaver" path="weaver.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="weaver" path="weaver.test.src.path" suite="BcweaverModuleTests"/> - </target> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/weaver.jar"/> - <copy file="weaver.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/weaver.jar" manifest="${build.ajdir}/temp/weaver.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - <!-- FIXME av weaver-all needed ? --> - +<!-- see ../build/*.html for explanation --> +<project name="weaver" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/weaver/newbuild.xml b/weaver/newbuild.xml deleted file mode 100644 index 46f8ca401..000000000 --- a/weaver/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="weaver" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - |