natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some details in SABBUS so that it works flawlessly (hopefully). 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5613 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dubochet 2006-01-20 16:38:11 +00:00
parent 5b59db4a4f
commit 76ba4c3c7e
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.xml
View File

@ -141,15 +141,6 @@ INITIALISATION
<path refid="common.classpath"/> <path refid="common.classpath"/>
</path> </path>
<!-- Creating boot-level tasks --> <!-- Creating boot-level tasks -->
<taskdef name="starr"
classname="scala.tools.ant.Scalac"
classpathref="starr.classpath"/>
<taskdef name="starrtool"
classname="scala.tools.ant.ScalaTool"
classpathref="starr.classpath"/>
<taskdef name="pico"
classname="jaco.pizza.ant.Pico"
classpath="${jaco.jar}"/>
<taskdef resource="net/sf/antcontrib/antlib.xml"> <taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath> <classpath>
<pathelement location="${ant-contrib.jar}"/> <pathelement location="${ant-contrib.jar}"/>
@ -191,6 +182,19 @@ INITIALISATION
<fail>System environment could not be determined</fail> <fail>System environment could not be determined</fail>
</else> </else>
</if> </if>
</target>
<target name="setup" depends="init">
<!-- Creating boot-level tasks -->
<taskdef name="starr"
classname="scala.tools.ant.Scalac"
classpathref="starr.classpath"/>
<taskdef name="starrtool"
classname="scala.tools.ant.ScalaTool"
classpathref="starr.classpath"/>
<taskdef name="pico"
classname="jaco.pizza.ant.Pico"
classpath="${jaco.jar}"/>
<!-- Removing any outdated stuff --> <!-- Removing any outdated stuff -->
<if> <if>
<and> <and>
@ -219,7 +223,7 @@ INITIALISATION
<property name="init.avail" value="yes"/> <property name="init.avail" value="yes"/>
</target> </target>
<target name="init.locker" depends="init, build.locker"> <target name="setup.locker" depends="setup, build.locker">
<path id="locker.classpath"> <path id="locker.classpath">
<pathelement location="${locker.dir}/${lib.dir.name}"/> <pathelement location="${locker.dir}/${lib.dir.name}"/>
<pathelement location="${locker.dir}/${comp.dir.name}"/> <pathelement location="${locker.dir}/${comp.dir.name}"/>
@ -233,7 +237,7 @@ INITIALISATION
classpathref="locker.classpath"/> classpathref="locker.classpath"/>
</target> </target>
<target name="init.quick" depends="init, build"> <target name="setup.quick" depends="setup, build">
<path id="quick.classpath"> <path id="quick.classpath">
<pathelement location="${quick.dir}/${lib.dir.name}"/> <pathelement location="${quick.dir}/${lib.dir.name}"/>
<pathelement location="${quick.dir}/${comp.dir.name}"/> <pathelement location="${quick.dir}/${comp.dir.name}"/>
@ -308,7 +312,7 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
<target name="newlocker" depends="clean.unfreeze, build.locker"/> <target name="newlocker" depends="clean.unfreeze, build.locker"/>
<target name="build.locker" depends="init" unless="locker.avail"> <target name="build.locker" depends="setup" unless="locker.avail">
<property name="built.locker" value="yes"/> <property name="built.locker" value="yes"/>
<!-- Build library --> <!-- Build library -->
<mkdir dir="${locker.lib.dir}"/> <mkdir dir="${locker.lib.dir}"/>
@ -386,7 +390,7 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
BUILD QUICK-TEST LAYER BUILD QUICK-TEST LAYER
============================================================================ --> ============================================================================ -->
<target name="build" depends="init.locker"> <target name="build" depends="setup.locker">
<!-- Build library --> <!-- Build library -->
<mkdir dir="${quick.lib.dir}"/> <mkdir dir="${quick.lib.dir}"/>
<pico srcdir="${src.dir}/${lib.dir.name}" <pico srcdir="${src.dir}/${lib.dir.name}"
@ -474,7 +478,7 @@ TEST
<target name="test" depends="clean, test.stability, test.strap"/> <target name="test" depends="clean, test.stability, test.strap"/>
<target name="build.strap" depends="init.quick"> <target name="build.strap" depends="setup.quick">
<!-- Build the bootstrap layer --> <!-- Build the bootstrap layer -->
<!-- Build library --> <!-- Build library -->
<mkdir dir="${strap.lib.dir}"/> <mkdir dir="${strap.lib.dir}"/>