diff options
| author | wisberg <wisberg> | 2005-05-19 03:48:09 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2005-05-19 03:48:09 +0000 |
| commit | 2afa9c9148da8566562ef029b9a5d6b5f141763c (patch) | |
| tree | e0c62bcb64d8a9884639743298b23eda89cf96cb /runtime | |
| parent | 79d3b2f57fab5ac2d63d402ee8c226082c872064 (diff) | |
| download | aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.tar.gz aspectj-2afa9c9148da8566562ef029b9a5d6b5f141763c.zip | |
newbuild.xml replacing build.xml, with Alex ok
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/build.xml | 56 | ||||
| -rw-r--r-- | runtime/newbuild.xml | 6 |
2 files changed, 3 insertions, 59 deletions
diff --git a/runtime/build.xml b/runtime/build.xml index 6ddcc7828..2102111ef 100644 --- a/runtime/build.xml +++ b/runtime/build.xml @@ -1,56 +1,6 @@ <?xml version="1.0"?> -<project name="runtime" default="all" basedir="."> - - <import file="../build/build-common.xml"/> - - <path id="runtime.test.src.path"> - <fileset dir="${basedir}/../lib"> - <include name="junit/*.jar"/> - </fileset> - <path refid="runtime.src.path"/> - </path> - - <path id="runtime.src.path"> - </path> - - <target name="compile" depends="init, compile:jdk13, compile:residual"> - <!-- don't use the Ant macro srccompile that is Java 1.3 level --> - <!-- use an indirection level since Java 5 does not accept -source 1.1 anymore --> - <!-- under Java 5 we will only ensure source 1.2 --> - </target> - <target name="compile:jdk13" if="jdk13"> - <!-- Note: note sure we can trust that. Pbly better if CruiseControl runs with a real 1.1 for this module --> - <!-- f.e. use a TreeMap (@since Java 1.2) somewhere, and it still compiles.. --> - <mkdir dir="../runtime/bin"/> - <javac debug="on" destdir="../runtime/bin" source="1.1" target="1.1"> - <src path="../runtime/src"/> - <classpath refid="runtime.src.path"/> - </javac> - </target> - <target name="compile:residual"> - <srccompile project="runtime" path="runtime.src.path"/> - </target> - - <target name="test:compile" depends="compile"> - <!-- TODO AV do we want to run them on 1.1 ? --> - <testcompile project="runtime" path="runtime.test.src.path"/> - </target> - - <target name="test" depends="test:compile"> - <testrun project="runtime" path="runtime.test.src.path" suite="RuntimeModuleTests"/> - </target> - - <target name="all" depends="init, compile, test:compile"/> - - <target name="jar" depends="compile"> - <delete file="${build.ajdir}/jars/runtime.jar"/> - <copy file="runtime.mf.txt" todir="${build.ajdir}/temp" filtering="yes"/> - <jar destfile="${build.ajdir}/jars/runtime.jar" manifest="${build.ajdir}/temp/runtime.mf.txt"> - <fileset dir="bin"> - <include name="**/*"/> - </fileset> - </jar> - </target> - +<!-- see ../build/*.html for explanation --> +<project name="runtime" default="test" basedir="."> + <import file="${basedir}/../build/build.xml"/> </project> diff --git a/runtime/newbuild.xml b/runtime/newbuild.xml deleted file mode 100644 index 2102111ef..000000000 --- a/runtime/newbuild.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="runtime" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - |