summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorwisberg <wisberg>2005-06-08 23:28:08 +0000
committerwisberg <wisberg>2005-06-08 23:28:08 +0000
commit747a6e82fe2c5df1db367eac9da612a10d6b4922 (patch)
tree0f814c599c9b30bcfd0d85a556f2bcdf6f39d9f3 /build.xml
parent4f1ce6df3b3f3fb2d6186d08438952df4cadc8a3 (diff)
downloadaspectj-747a6e82fe2c5df1db367eac9da612a10d6b4922.tar.gz
aspectj-747a6e82fe2c5df1db367eac9da612a10d6b4922.zip
updated for new build/build.xml instead of build/build-master.xml
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml41
1 files 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>