refactor build for Eclipse requirement..

ajbrowser/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="ajbrowser" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../ajde/build.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../bridge/build.xml"/>

ajde/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="ajde" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../runtime/build.xml"/>
     <import file="../org.aspectj.ajdt.core/build.xml"/>
 

ajdoc/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="ajdoc" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../org.aspectj.ajdt.core/build.xml"/>

asm/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="asm" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../bridge/build.xml"/> 
 
     <path id="asm.test.src.path">

aspectj5rt/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="aspectj5rt" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../runtime/build.xml"/>
 
     <path id="aspectj5rt.test.src.path">

bcel-builder/build.xml

@@ -3,7 +3,7 @@
     <!-- *********************************************************************** -->
     <!-- compliance for Alex build -->
     <!-- *********************************************************************** -->
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
 
     <path id="bcel-builder.test.src.path">
         <fileset dir="${basedir}/../lib">

bridge/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="bridge" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../util/build.xml"/> 
 
     <path id="bridge.test.src.path">

build.xml

@@ -1,90 +1,43 @@
 <?xml version="1.0"?>
-<project name="aspectj" basedir=".">
+<project name="aspectj" basedir="." default="all">
 
-   <target name="patch">
-       <cvs output="patch">
-            <commandline>
-                <argument line="-q diff -u -N"/>
-            </commandline>
-        </cvs>
-    </target>
+    <!-- a root build.xml that redirects to build/build-ant.xml for convenience so that ones can type
+    "ant .." straight in the modules/ root --> 
 
-    <macrodef name="targets">
-        <attribute name="name"/>
-        <sequential>
-            <subant target="@{name}">
-                <!-- TODO ant 1.7 stuff here would be better.. -->
-                <!-- TODO: we do not call RunBeforeCommit since all test will be run thru each module separately -->
-                <filelist dir="."
-                          files="runtime/build.xml,
-                                 util/build.xml,
-                                 bridge/build.xml,
-                                 aspectj5rt/build.xml,
-                                 bcel-builder/build.xml,
-                                 testing-util/build.xml,
-                                 asm/build.xml,
-                                 weaver/build.xml,
-                                 org.aspectj.ajdt.core/build.xml,
-                                 ajde/build.xml,
-                                 testing-client/build.xml,
-                                 taskdefs/build.xml,
-                                 testing/build.xml,
-                                 testing-drivers/build.xml,
-                                 ajdoc/build.xml,
-                                 ajbrowser/build.xml,
-                                 tests/build.xml,
-                                 loadtime/build.xml,
-                                 loadtime5/build.xml"/>
-            </subant>
-        </sequential>
-    </macrodef>
+    <target name="clean">
+        <subant target="clean">
+            <fileset dir="." includes="build/build-ant.xml"/>
+        </subant>
+    </target>
 
-    <target name="all">
-        <targets name="all"/>
+    <target name="cleanall">
+        <subant target="cleanall">
+            <fileset dir="." includes="build/build-ant.xml"/>
+        </subant>
     </target>
 
-    <target name="clean">
-        <targets name="clean"/>
-        <mkdir dir="aj-build/dist"/>
-        <mkdir dir="aj-build/jars"/>
+    <target name="all">
+        <subant target="all">
+            <fileset dir="." includes="build/build-ant.xml"/>
+        </subant>
     </target>
 
-    <target name="cleanall">
-        <targets name="cleanall"/>
-        <delete dir="aj-build"/>
+    <target name="compile">
+        <subant target="compile">
+            <fileset dir="." includes="build/build-ant.xml"/>
+        </subant>
     </target>
 
     <target name="test">
-        <targets name="test"/>
+        <subant target="test">
+            <fileset dir="." includes="build/build-ant.xml"/>
+        </subant>
     </target>
 
     <target name="jar">
         <subant target="jar">
-            <!-- TODO ant 1.7 stuff here would be better.. -->
-            <filelist dir="."
-                      files="runtime/build.xml,
-                             util/build.xml,
-                             bridge/build.xml,
-                             aspectj5rt/build.xml,
-                             bcel-builder/build.xml,
-                             asm/build.xml,
-                             weaver/build.xml,
-                             org.aspectj.ajdt.core/build.xml,
-                             ajde/build.xml,
-                             taskdefs/build.xml,
-                             ajdoc/build.xml,
-                             ajbrowser/build.xml,
-                             loadtime/build.xml,
-                             loadtime5/build.xml"/>
-            <!-- TODO av org.aspectj.lib -->
-        </subant>
-        <!-- FIXME av bcel-builder -->
-    </target>
-
-    <target name="docs">
-        <subant target="dist">
-            <filelist dir="." files="docs/build.xml"/>
+            <fileset dir="." includes="build/build-ant.xml"/>
         </subant>
     </target>
 
-</project>
+</project>

build/build-ant.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<project name="build" basedir=".">
+
+   <target name="patch">
+       <cvs output="patch">
+            <commandline>
+                <argument line="-q diff -u -N"/>
+            </commandline>
+        </cvs>
+    </target>
+
+    <macrodef name="targets">
+        <attribute name="name"/>
+        <sequential>
+            <subant target="@{name}">
+                <!-- TODO ant 1.7 stuff here would be better.. -->
+                <!-- TODO: we do not call RunBeforeCommit since all test will be run thru each module separately -->
+                <filelist dir=".."
+                          files="runtime/build.xml,
+                                 util/build.xml,
+                                 bridge/build.xml,
+                                 aspectj5rt/build.xml,
+                                 bcel-builder/build.xml,
+                                 testing-util/build.xml,
+                                 asm/build.xml,
+                                 weaver/build.xml,
+                                 org.aspectj.ajdt.core/build.xml,
+                                 ajde/build.xml,
+                                 testing-client/build.xml,
+                                 taskdefs/build.xml,
+                                 testing/build.xml,
+                                 testing-drivers/build.xml,
+                                 ajdoc/build.xml,
+                                 ajbrowser/build.xml,
+                                 tests/build.xml,
+                                 loadtime/build.xml,
+                                 loadtime5/build.xml"/>
+            </subant>
+        </sequential>
+    </macrodef>
+
+    <target name="all">
+        <targets name="all"/>
+    </target>
+
+    <target name="clean">
+        <targets name="clean"/>
+        <mkdir dir="../aj-build/dist"/>
+        <mkdir dir="../aj-build/jars"/>
+    </target>
+
+    <target name="cleanall">
+        <targets name="cleanall"/>
+        <delete dir="../aj-build"/>
+    </target>
+
+    <target name="test">
+        <targets name="test"/>
+    </target>
+
+    <target name="jar">
+        <subant target="jar">
+            <!-- TODO ant 1.7 stuff here would be better.. -->
+            <filelist dir=".."
+                      files="runtime/build.xml,
+                             util/build.xml,
+                             bridge/build.xml,
+                             aspectj5rt/build.xml,
+                             bcel-builder/build.xml,
+                             asm/build.xml,
+                             weaver/build.xml,
+                             org.aspectj.ajdt.core/build.xml,
+                             ajde/build.xml,
+                             taskdefs/build.xml,
+                             ajdoc/build.xml,
+                             ajbrowser/build.xml,
+                             loadtime/build.xml,
+                             loadtime5/build.xml"/>
+            <!-- TODO av org.aspectj.lib -->
+        </subant>
+        <!-- FIXME av bcel-builder -->
+    </target>
+
+    <target name="docs">
+        <subant target="dist">
+            <filelist dir=".." files="docs/build.xml"/>
+        </subant>
+    </target>
+
+</project>

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>

loadtime/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="loadtime" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../util/build.xml"/>

loadtime5/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="loadtime5" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../loadtime/build.xml"/>

org.aspectj.ajdt.core/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="org.aspectj.ajdt.core" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../runtime/build.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../bridge/build.xml"/>

run-all-junit-tests/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="run-all-junit-tests" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../ajbrowser/build.xml"/>
     <import file="../ajde/build.xml"/>
     <import file="../asm/build.xml"/>

runtime/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="runtime" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
 
     <path id="runtime.test.src.path">
         <fileset dir="${basedir}/../lib">

taskdefs/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="taskdefs" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../org.aspectj.ajdt.core/build.xml"/>
 

testing-client/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="testing-client" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../bridge/build.xml"/>
 
     <path id="testing-client.test.src.path">

testing-drivers/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="testing-drivers" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../ajde/build.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../taskdefs/build.xml"/>

testing-util/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="testing-util" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../util/build.xml"/>
     <import file="../runtime/build.xml"/>

testing/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="testing" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../ajde/build.xml"/>
     <import file="../bridge/build.xml"/>
     <import file="../taskdefs/build.xml"/>

tests/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="tests" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../ajde/build.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../bridge/build.xml"/>

util/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="util" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
 
     <path id="util.test.src.path">
         <path refid="util.src.path"/>

weaver/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="weaver" default="all" basedir=".">
 
-    <import file="../build-common.xml"/>
+    <import file="../build/build-common.xml"/>
     <import file="../asm/build.xml"/>
     <import file="../runtime/build.xml"/>
     <import file="../util/build.xml"/>