fixing Alex build dependancies. Adding top level build. Usefull for patch creation

diff --git a/build.xml b/build.xml
new file mode 100644 (file)
index 0000000..75a356a
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<project name="aspectj" basedir="." default="all">
+
+    <!-- a root build.xml that redirects to build/build-master.xml for convenience so that ones can type
+    "ant .." straight in the modules/ root -->
+
+    <target name="patch">
+        <cvs output="patch">
+             <commandline>
+                 <argument line="-q diff -u -N"/>
+             </commandline>
+         </cvs>
+     </target>
+
+    <target name="clean">
+        <subant target="clean">
+            <fileset dir="." includes="build/build-master.xml"/>
+        </subant>
+    </target>
+
+    <target name="cleanall">
+        <subant target="cleanall">
+            <fileset dir="." includes="build/build-master.xml"/>
+        </subant>
+    </target>
+
+    <target name="all">
+        <subant target="all">
+            <fileset dir="." includes="build/build-master.xml"/>
+        </subant>
+    </target>
+
+    <target name="compile">
+        <subant target="compile">
+            <fileset dir="." includes="build/build-master.xml"/>
+        </subant>
+    </target>
+
+    <target name="test">
+        <subant target="test">
+            <fileset dir="." includes="build/build-master.xml"/>
+        </subant>
+    </target>
+
+    <target name="jar">
+        <subant target="jar">
+            <fileset dir="." includes="build/build-master.xml"/>
+        </subant>
+    </target>
+
+</project>
\ No newline at end of file

diff --git a/build/build-master.xml b/build/build-master.xml
index 980e3a24254ffe77aed8679431f55e7836445ca3..fe2ee3a0bb323a3d0da4f15d3ad674a3163f44c4 100644 (file)
--- a/build/build-master.xml
+++ b/build/build-master.xml
@@ -1,14 +1,6 @@
 <?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>
@@ -33,6 +25,9 @@
                                  ajdoc/build.xml,
                                  ajbrowser/build.xml,
                                  tests/build.xml"/>
+<!--FIXME AV when LTW modules are there                -->
+<!--                                 loadtime/build.xml,-->
+<!--                                 loadtime5/build.xml"-->
             </subant>
         </sequential>
     </macrodef>
@@ -76,9 +71,10 @@ loadtime5/build.xml
                              ajde/build.xml,
                              taskdefs/build.xml,
                              ajdoc/build.xml,
-                             ajbrowser/build.xml,
-                             loadtime/build.xml,
-                             loadtime5/build.xml"/>
+                             ajbrowser/build.xml"/>
+<!--FIXME AV when LTW modules are there                -->
+<!--                             loadtime/build.xml,-->
+<!--                             loadtime5/build.xml-->
             <!-- TODO av org.aspectj.lib -->
         </subant>
         <!-- FIXME av bcel-builder -->

diff --git a/testing/build.xml b/testing/build.xml
index 3358fc43fa9796ac6675e81e99fe7f58cc75c573..5bd931aa59b38bad2f8de458c74b2dbe7bfcc883 100644 (file)
--- a/testing/build.xml
+++ b/testing/build.xml
@@ -5,6 +5,7 @@
     <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"/>
@@ -28,6 +29,7 @@
         <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">
@@ -42,6 +44,7 @@
                                     asm.compile,
                                     bridge.compile,
                                     taskdefs.compile,
+                                    testing-client.compile,
                                     testing-util.compile,
                                     util.compile">
         <srccompile project="testing" path="testing.src.path"/>

diff --git a/tests/build.xml b/tests/build.xml
index 34005cf0098aa7e649b22c8b09d201f194b5ba81..aed5613f7907c4aba208bd988fb775c59a5c0907 100644 (file)
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -13,7 +13,6 @@
         <!-- all are for test run -->
         <path refid="tests.src.path"/>
         <pathelement path="../runtime/bin"/>
-        <pathelement path="../org.aspectj.ajdt.core/bin"/>
         <pathelement path="../weaver/bin"/>
         <fileset dir="${basedir}/../lib">
             <include name="junit/*.jar"/>
@@ -28,6 +27,7 @@
         <pathelement path="../ajde/bin"/>
         <pathelement path="../asm/bin"/>
         <pathelement path="../bridge/bin"/>
+        <pathelement path="../org.aspectj.ajdt.core/bin"/>
         <pathelement path="../org.aspectj.ajdt.core/bintest"/>
         <pathelement path="../testing/bin"/>
         <pathelement path="../testing-drivers/bin"/>