summaryrefslogtreecommitdiffstats
path: root/testing-util
diff options
context:
space:
mode:
authorwisberg <wisberg>2005-05-19 03:48:09 +0000
committerwisberg <wisberg>2005-05-19 03:48:09 +0000
commit2afa9c9148da8566562ef029b9a5d6b5f141763c (patch)
treee0c62bcb64d8a9884639743298b23eda89cf96cb /testing-util
parent79d3b2f57fab5ac2d63d402ee8c226082c872064 (diff)
downloadaspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.tar.gz
aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.zip
newbuild.xml replacing build.xml, with Alex ok
Diffstat (limited to 'testing-util')
-rw-r--r--testing-util/build.xml47
-rw-r--r--testing-util/newbuild.xml6
2 files changed, 3 insertions, 50 deletions
diff --git a/testing-util/build.xml b/testing-util/build.xml
index f5c57973e..804ea5091 100644
--- a/testing-util/build.xml
+++ b/testing-util/build.xml
@@ -1,47 +1,6 @@
<?xml version="1.0"?>
-<project name="testing-util" default="all" basedir=".">
-
- <import file="../build/build-common.xml"/>
- <import file="../bridge/build.xml"/>
- <import file="../util/build.xml"/>
- <import file="../runtime/build.xml"/>
-
-
- <path id="testing-util.test.src.path">
- <fileset dir="${basedir}/../lib">
- <include name="junit/*.jar"/>
- <include name="bcel/*.jar"/>
- </fileset>
- <!-- depends on weaver to use Dissasemble feature on LazyClassGen to test comparison of .class file -->
- <pathelement path="../weaver/bin"/>
- <pathelement path="../runtime/bin"/>
- <path refid="testing-util.src.path"/>
- </path>
-
- <path id="testing-util.src.path">
- <fileset dir="${basedir}/../lib">
- <include name="jdiff/*.jar"/>
- </fileset>
- <pathelement path="../bridge/bin"/>
- <pathelement path="../util/bin"/>
- </path>
-
- <target name="compile" depends="init,
- bridge.compile,
- util.compile">
- <srccompile project="testing-util" path="testing-util.src.path"/>
- </target>
-
- <target name="test:compile" depends="compile">
- <testcompile project="testing-util" path="testing-util.test.src.path"/>
- </target>
-
- <target name="test" depends="test:compile,
- runtime.compile">
- <!-- depends on weaver to access .class dissassemble utility hence circular -->
- <subant antfile="build.xml" target="test:compile" buildpath="../weaver" />
- <testrun project="testing-util" path="testing-util.test.src.path" suite="TestingUtilModuleTests"/>
- </target>
-
+<!-- see ../build/*.html for explanation -->
+<project name="testing-util" default="test" basedir=".">
+ <import file="${basedir}/../build/build.xml"/>
</project>
diff --git a/testing-util/newbuild.xml b/testing-util/newbuild.xml
deleted file mode 100644
index 804ea5091..000000000
--- a/testing-util/newbuild.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="testing-util" default="test" basedir=".">
- <import file="${basedir}/../build/build.xml"/>
-</project>
-