Browse Source

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

tags/PRE_ANDY
avasseur 19 years ago
parent
commit
cf35fc6351
4 changed files with 62 additions and 12 deletions
  1. 51
    0
      build.xml
  2. 7
    11
      build/build-master.xml
  3. 3
    0
      testing/build.xml
  4. 1
    1
      tests/build.xml

+ 51
- 0
build.xml View File

@@ -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>

+ 7
- 11
build/build-master.xml View File

@@ -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 -->

+ 3
- 0
testing/build.xml View File

@@ -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"/>

+ 1
- 1
tests/build.xml View File

@@ -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"/>

Loading…
Cancel
Save