From 747a6e82fe2c5df1db367eac9da612a10d6b4922 Mon Sep 17 00:00:00 2001
From: wisberg <wisberg>
Date: Wed, 8 Jun 2005 23:28:08 +0000
Subject: [PATCH] updated for new build/build.xml instead of
 build/build-master.xml

---
 build.xml | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/build.xml b/build.xml
index 75a356a95..8258e80dd 100644
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
-<project name="aspectj" basedir="." default="all">
+<project name="run-all-junit-tests" basedir="build" 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 -->
+    <!-- redirect to build/build.xml to build from modules root -->
+    <!-- user should still set up build/local.properties -->
+
+    <property name="aspectj.modules.dir" location="${basedir}/.."/>
+
+    <macrodef name="aj-ant">
+        <attribute name="target"/>
+        <sequential>
+            <ant inheritAll="false" target="@{target}" dir="${basedir}"/>
+        </sequential>
+    </macrodef>
 
     <target name="patch">
         <cvs output="patch">
@@ -13,39 +22,27 @@
      </target>
 
     <target name="clean">
-        <subant target="clean">
-            <fileset dir="." includes="build/build-master.xml"/>
-        </subant>
+        <aj-ant target="clean"/>
     </target>
 
     <target name="cleanall">
-        <subant target="cleanall">
-            <fileset dir="." includes="build/build-master.xml"/>
-        </subant>
+        <aj-ant target="clean"/>
     </target>
 
     <target name="all">
-        <subant target="all">
-            <fileset dir="." includes="build/build-master.xml"/>
-        </subant>
+        <aj-ant target="all"/>
     </target>
 
     <target name="compile">
-        <subant target="compile">
-            <fileset dir="." includes="build/build-master.xml"/>
-        </subant>
+        <aj-ant target="all"/>
     </target>
 
     <target name="test">
-        <subant target="test">
-            <fileset dir="." includes="build/build-master.xml"/>
-        </subant>
+        <aj-ant target="test"/>
     </target>
 
     <target name="jar">
-        <subant target="jar">
-            <fileset dir="." includes="build/build-master.xml"/>
-        </subant>
+        <aj-ant target="all"/>
     </target>
 
-</project>
\ No newline at end of file
+</project>
-- 
2.39.5