From branch: New build scripts that Alex uses under IntelliJ - can be run individually or via master in build module.

18 files changed, 1072 insertions, 1 deletions

diff --git a/ajbrowser/build.xml b/ajbrowser/build.xml
new file mode 100644
index 000000000..2728bd418
--- /dev/null
+++ b/ajbrowser/build.xml
@@ -0,0 +1,50 @@
+<?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>
+
+</project>
+
diff --git a/ajde/build.xml b/ajde/build.xml
new file mode 100644
index 000000000..33dba5c08
--- /dev/null
+++ b/ajde/build.xml
@@ -0,0 +1,62 @@
+<?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>
+
+</project>
+
diff --git a/ajdoc/build.xml b/ajdoc/build.xml
new file mode 100644
index 000000000..f187f6e05
--- /dev/null
+++ b/ajdoc/build.xml
@@ -0,0 +1,73 @@
+<?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>
+            <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>
+
+</project>
+
diff --git a/asm/build.xml b/asm/build.xml
new file mode 100644
index 000000000..3057e9262
--- /dev/null
+++ b/asm/build.xml
@@ -0,0 +1,40 @@
+<?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>
+</project>
+
diff --git a/aspectj5rt/build.xml b/aspectj5rt/build.xml
new file mode 100644
index 000000000..24d8cf7ad
--- /dev/null
+++ b/aspectj5rt/build.xml
@@ -0,0 +1,48 @@
+<?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">
+        <!-- TODO: if test relies on 1.5 source, then needs to override below -->
+        <testcompile project="aspectj5rt" path="aspectj5rt.test.src.path"/>
+    </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>
+
+</project>
+
diff --git a/bcel-builder/build.xml b/bcel-builder/build.xml
index 1d7809267..64f0d794a 100644
--- a/bcel-builder/build.xml
+++ b/bcel-builder/build.xml
@@ -1,4 +1,43 @@
-<project default="packageAndPush" basedir=".">
+<project name="bcel-builder" default="packageAndPush" basedir=".">
+
+    <!-- *********************************************************************** -->
+    <!-- compliance for Alex build -->
+    <!-- *********************************************************************** -->
+    <import file="../build/build-common.xml"/>
+
+    <path id="bcel-builder.test.src.path">
+        <fileset dir="${basedir}/../lib">
+            <include name="junit/*.jar"/>
+        </fileset>
+        <path refid="bcel-builder.src.path"/>
+    </path>
+
+    <path id="bcel-builder.src.path">
+        <fileset dir="${basedir}/../lib">
+            <include name="regexp/*.jar"/>
+        </fileset>
+    </path>
+
+    <target name="cleanall" depends="clean">
+        <delete dir="bin"/>
+        <!-- FIXME: not consistent with Alex policy -->
+        <mkdir dir="bin"/>
+    </target>
+
+    <target name="compile" depends="init">
+        <srccompile project="bcel-builder" path="bcel-builder.src.path"/>
+    </target>
+
+    <target name="test:compile" depends="compile">
+        <testcompile project="bcel-builder" path="bcel-builder.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile">
+        <testrun project="bcel-builder" path="bcel-builder.test.src.path" suite="org.aspectj.apache.bcel.classfile.tests.AllTests"/>
+    </target>
+    <!-- *********************************************************************** -->
+
+
 
   <!-- top-level -->
   <target name="extractAndPatchAndJar" depends="extractAndPatch,jar,srcjar" />
diff --git a/bridge/build.xml b/bridge/build.xml
new file mode 100644
index 000000000..ebd236b77
--- /dev/null
+++ b/bridge/build.xml
@@ -0,0 +1,41 @@
+<?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>
+
+</project>
+
diff --git a/build/build-common.xml b/build/build-common.xml
new file mode 100644
index 000000000..870ef9fff
--- /dev/null
+++ b/build/build-common.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<project name="common" basedir=".">
+
+    <condition property="jdk15" value="yes">
+        <contains string="${java.version}" substring="1.5"/>
+    </condition>
+    <condition property="jdk14" value="yes">
+        <contains string="${java.version}" substring="1.4"/>
+    </condition>
+    <condition property="jdk13" value="yes">
+        <contains string="${java.version}" substring="1.3"/>
+    </condition>
+
+    <target name="init">
+        <property name="src.dir" value="src"/>
+        <property name="test.src.dir" value="testsrc"/>
+        <property name="build.dir" value="bin"/>
+        <property name="test.build.dir" value="bintest"/>
+        <property name="build.ajdir" value="../aj-build"/>
+        <mkdir dir="${build.ajdir}"/>
+        <mkdir dir="${build.ajdir}/jars"/>
+
+
+        <!-- props for manifest files -->
+        <property name="build.version"       value="DEVELOPMENT"/>
+        <property name="build.version.base"  value="1.2"/>
+        <property name="build.version.long"  value="DEVELOPMENT"/>
+        <property name="build.version.short" value="DEVELOPMENT"/>
+        <property name="build.version.eclipse.plugins" value="9.9.9"/>
+        <!-- formats comply with SimpleDateFormat -->
+        <property name="build.time.format"   value="EEEE MMM d, yyyy 'at' HH:mm:ss z"/>
+        <property name="build.date.format"   value="EEEE MMM d, yyyy"/>
+        <tstamp>
+          <format property="build.date"
+                   pattern="${build.date.format}"
+                   timezone="GMT"/>
+          <format property="build.time"
+                   pattern="${build.time.format}"
+                   timezone="GMT"/>
+        </tstamp>
+        <filter token="build.version"       value="${build.version}"/>
+        <filter token="build.version.base"  value="${build.version.base}"/>
+        <filter token="build.version.long"  value="${build.version.long}"/>
+        <filter token="build.version.short" value="${build.version.short}"/>
+
+        <filter token="build.time.format"   value="${build.time.format}"/>
+        <filter token="build.date.format"   value="${build.date.format}"/>
+        <filter token="build.date"          value="${build.date}"/>
+        <filter token="build.time"          value="${build.time}"/>
+        <filter token="company.name"        value="${company.name}"/><!-- FIXME av undefined -->
+        <filter token="copyright.allRights.from1998"
+                value="${copyright.allRights.from1998}" /><!-- FIXME av where used ? -->
+    </target>
+
+    <target name="clean" depends="init, cleanall">
+        <mkdir dir="${build.dir}"/>
+        <mkdir dir="${test.build.dir}"/>
+    </target>
+
+    <target name="cleanall" depends="init">
+        <delete dir="${build.dir}"/>
+        <delete dir="${test.build.dir}"/>
+        <!-- rather common to have ajcore files produced after a test run -->
+        <delete>
+            <fileset dir="${basedir}" includes="ajcore.*.txt"/>
+        </delete>
+    </target>
+
+    <macrodef name="srccompile">
+        <attribute name="project"/>
+        <attribute name="path"/>
+        <sequential>
+            <echo message="compile ... @{project}"/>
+            <mkdir dir="../@{project}/${build.dir}"/>
+            <javac debug="on" destdir="../@{project}/${build.dir}" source="1.3" target="1.3">
+                <src path="../@{project}/${src.dir}"/>
+                <classpath refid="@{path}"/>
+            </javac>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="testcompile">
+        <attribute name="project"/>
+        <attribute name="path"/>
+        <sequential>
+            <echo message="test:compile ... @{project}"/>
+            <mkdir dir="../@{project}/${test.build.dir}"/>
+            <javac debug="on" destdir="../@{project}/${test.build.dir}" source="1.3" target="1.3">
+                <src path="../@{project}/${test.src.dir}"/>
+                <classpath refid="@{path}"/>
+                <classpath path="../@{project}/${build.dir}"/>
+            </javac>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="testrun">
+        <attribute name="project"/>
+        <attribute name="path"/>
+        <attribute name="suite"/>
+        <sequential>
+            <!--   showoutput="on" -->
+<!--            <junit showoutput="on" fork="on" haltonfailure="on" haltonerror="on" printsummary="on" dir="../@{project}">-->
+<!--                <classpath>-->
+<!--                    <pathelement path="../@{project}/${build.dir}"/>-->
+<!--                    <pathelement path="../@{project}/${test.build.dir}"/>-->
+<!--                    <path refid="@{path}"/>-->
+<!--                </classpath>-->
+<!--                <test name="@{suite}"/>-->
+<!--            </junit>-->
+            <!-- TODO AV - using java to invoke JUnit since the junit task is hidding errors - don't know why -->
+            <java classname="@{suite}" fork="on" dir="../@{project}">
+                <jvmarg line=""/>
+                <classpath>
+                    <pathelement path="../@{project}/${build.dir}"/>
+                    <pathelement path="../@{project}/${test.build.dir}"/>
+                    <path refid="@{path}"/>
+                </classpath>
+            </java>
+        </sequential>
+    </macrodef>
+
+    <target name="all" depends="init, compile, test:compile"/>
+
+
+</project>
diff --git a/org.aspectj.ajdt.core/build.xml b/org.aspectj.ajdt.core/build.xml
new file mode 100644
index 000000000..224c3eea5
--- /dev/null
+++ b/org.aspectj.ajdt.core/build.xml
@@ -0,0 +1,69 @@
+<?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>
+
+</project>
+
diff --git a/run-all-junit-tests/build.xml b/run-all-junit-tests/build.xml
new file mode 100644
index 000000000..5fc2499d8
--- /dev/null
+++ b/run-all-junit-tests/build.xml
@@ -0,0 +1,106 @@
+<?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="../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="../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,
+                                         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">
+        <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>
+
+</project>
+
diff --git a/runtime/build.xml b/runtime/build.xml
new file mode 100644
index 000000000..fb36d8957
--- /dev/null
+++ b/runtime/build.xml
@@ -0,0 +1,41 @@
+<?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">
+        <srccompile project="runtime" path="runtime.src.path"/>
+    </target>
+
+    <target name="test:compile" depends="compile">
+        <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/aspectjrt.jar"/>
+        <copy file="runtime.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/>
+        <jar destfile="${build.ajdir}/jars/aspectjrt.jar" manifest="${build.ajdir}/temp/runtime.mf.txt">
+            <fileset dir="bin">
+                <include name="**/*"/>
+            </fileset>
+        </jar>
+    </target>
+
+</project>
+
diff --git a/taskdefs/build.xml b/taskdefs/build.xml
new file mode 100644
index 000000000..81dda6c88
--- /dev/null
+++ b/taskdefs/build.xml
@@ -0,0 +1,64 @@
+<?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>
+
+</project>
+
diff --git a/testing-client/build.xml b/testing-client/build.xml
new file mode 100644
index 000000000..8f9e8d4ad
--- /dev/null
+++ b/testing-client/build.xml
@@ -0,0 +1,35 @@
+<?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>
+
+
+</project>
+
diff --git a/testing-drivers/build.xml b/testing-drivers/build.xml
new file mode 100644
index 000000000..0da9f8d69
--- /dev/null
+++ b/testing-drivers/build.xml
@@ -0,0 +1,60 @@
+<?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>
+
+
+</project>
+
diff --git a/testing-util/build.xml b/testing-util/build.xml
new file mode 100644
index 000000000..f5c57973e
--- /dev/null
+++ b/testing-util/build.xml
@@ -0,0 +1,47 @@
+<?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>
+
+</project>
+
diff --git a/testing/build.xml b/testing/build.xml
new file mode 100644
index 000000000..3358fc43f
--- /dev/null
+++ b/testing/build.xml
@@ -0,0 +1,71 @@
+<?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"/>
+
+    <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-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-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>
+
+</project>
+
diff --git a/util/build.xml b/util/build.xml
new file mode 100644
index 000000000..7618057ab
--- /dev/null
+++ b/util/build.xml
@@ -0,0 +1,38 @@
+<?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>
+
+</project>
+
diff --git a/weaver/build.xml b/weaver/build.xml
new file mode 100644
index 000000000..040435c0f
--- /dev/null
+++ b/weaver/build.xml
@@ -0,0 +1,62 @@
+<?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="org.aspectj.weaver.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 ? -->
+
+</project>
+