summaryrefslogtreecommitdiff
path: root/sabbus.xml
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2008-03-07 13:42:56 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2008-03-07 13:42:56 +0000
commit060068379f97ed88544b145a63b9bfc7b8f01d8b (patch)
tree3a113ea209e9ecbd3240a3aaf0fe47477ad84787 /sabbus.xml
parentfb31f764a21178353f78c032a7c1059d024dfe00 (diff)
downloadscala-060068379f97ed88544b145a63b9bfc7b8f01d8b.tar.gz
scala-060068379f97ed88544b145a63b9bfc7b8f01d8b.tar.bz2
scala-060068379f97ed88544b145a63b9bfc7b8f01d8b.zip
Improved SuperSABBUS w.r.t.
Diffstat (limited to 'sabbus.xml')
-rw-r--r--sabbus.xml24
1 files changed, 10 insertions, 14 deletions
diff --git a/sabbus.xml b/sabbus.xml
index a215d060b8..a679f4b3be 100644
--- a/sabbus.xml
+++ b/sabbus.xml
@@ -243,14 +243,12 @@ BUILD QUICK LAYER
<!-- Build library -->
<mkdir dir="${build-quick.dir}/classes/library"/>
<javac
- srcdir="${src.dir}/library"
- destdir="${build-quick.dir}/classes/library"
- classpath="${build-quick.dir}/classes/library"
- includes="**/*.java"/>
- <javac srcdir="${src.dir}/actors"
+ srcdir="${src.dir}"
destdir="${build-quick.dir}/classes/library"
- classpath="${build-quick.dir}/classes/library"
- includes="**/*.java"/>
+ classpath="${build-quick.dir}/classes/library">
+ <include name="library/**/*.java"/>
+ <include name="actors/**/*.java"/>
+ </javac>
<sabmake id="locker.lib.scalac"
destdir="${build-quick.dir}/classes/library"
compilerpathref="locker.classpath"
@@ -354,12 +352,10 @@ BUILD STRAP LAYER
<javac
srcdir="${src.dir}/library"
destdir="${build-strap.dir}/classes/library"
- classpath="${build-strap.dir}/classes/library"
- includes="**/*.java"/>
- <javac srcdir="${src.dir}/actors"
- destdir="${build-strap.dir}/classes/library"
- classpath="${build-strap.dir}/classes/library"
- includes="**/*.java"/>
+ classpath="${build-strap.dir}/classes/library">
+ <include name="library/**/*.java"/>
+ <include name="actors/**/*.java"/>
+ </javac>
<sabmake id="quick.lib.scalac"
destdir="${build-strap.dir}/classes/library"
compilerpathref="quick.classpath"
@@ -595,7 +591,7 @@ BOOTRAPING TEST AND TEST SUITE
<target name="suite.test" depends="partest.load, pack.load">
<taskdef resource="scala/tools/partest/antlib.xml" classpathref="pack.classpath"/>
- <partest showlog="yes">
+ <partest showlog="yes" erroronfailed="yes">
<classpath>
<path refid="pack.classpath"/>
<fileset dir="${test.dir}/files/lib" includes="*.jar"/>