diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-04-14 10:18:35 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-04-14 10:18:35 +0000 |
| commit | c0090ac04b035db94a4febd9bfbc7e9e28efa29a (patch) | |
| tree | 7a00b04fc871306aff62a8a90bafac7b245bea65 | |
| parent | df1c1931cf2b1e0191e444d72a548355c8bf1451 (diff) | |
| download | scala-c0090ac04b035db94a4febd9bfbc7e9e28efa29a.tar.gz scala-c0090ac04b035db94a4febd9bfbc7e9e28efa29a.tar.bz2 scala-c0090ac04b035db94a4febd9bfbc7e9e28efa29a.zip | |
Tiny fixes to SuperSabbus.
| -rw-r--r-- | sabbus.xml | 6 | ||||
| -rw-r--r-- | src/build/four.xml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sabbus.xml b/sabbus.xml index c42ba65e71..2847271761 100644 --- a/sabbus.xml +++ b/sabbus.xml @@ -78,7 +78,6 @@ PROPERTIES <property name="msil.jar" value="${lib.dir}/msil.jar"/> <property name="jline.jar" value="${lib.dir}/jline.jar"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> - <property name="ant-contrib.jar" value="${lib.dir}/ant-contrib.jar"/> <!-- Sets location of build folders --> <property name="build.dir" value="${basedir}/build"/> @@ -100,8 +99,7 @@ INITIALISATION <target name="init"> <!-- Setting-up Ant contrib tasks --> - <taskdef resource="net/sf/antcontrib/antlib.xml" - classpath="${ant-contrib.jar}"/> + <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant-contrib.jars"/> <!-- This is the start time for the distribution --> <tstamp prefix="time"> <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/> @@ -944,7 +942,7 @@ FORWARDED TARGETS FOR JVM 1.4 BUILD <ant antfile="${src.dir}/build/four.xml" target="four-test.done" inheritall="yes" inheritrefs="yes"/> </target> - <target name="fourdist" depends="pack.done"> + <target name="fourdist" depends="all.done"> <ant antfile="${src.dir}/build/four.xml" target="four-all.done" inheritall="yes" inheritrefs="yes"/> </target> diff --git a/src/build/four.xml b/src/build/four.xml index 5b1579a684..45e0e85ac7 100644 --- a/src/build/four.xml +++ b/src/build/four.xml @@ -299,6 +299,10 @@ DISTRIBUTION </jar> </target> + <target name="four-dist.latest" depends="four-dist.src" unless="os.win"> + <symlink link="${dists.dir}/latest-jvm4" resource="${four-dist.dir}" overwrite="yes"/> + </target> + <target name="four-dist.done" depends="four-dist.src"/> <!-- =========================================================================== |