diff options
| author | Tiark Rompf <tiark.rompf@epfl.ch> | 2010-03-25 16:14:56 +0000 |
|---|---|---|
| committer | Tiark Rompf <tiark.rompf@epfl.ch> | 2010-03-25 16:14:56 +0000 |
| commit | 1cedf8047ba9820277b2b9e546092918e6e0c7d1 (patch) | |
| tree | c1bc414403baccde9a45715ec61609a456786ee1 /build.xml | |
| parent | 63103a5e1a4970d7984d15efe8db4c30fbb56828 (diff) | |
| download | scala-1cedf8047ba9820277b2b9e546092918e6e0c7d1.tar.gz scala-1cedf8047ba9820277b2b9e546092918e6e0c7d1.tar.bz2 scala-1cedf8047ba9820277b2b9e546092918e6e0c7d1.zip | |
fixed double-loading of plugins.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -632,7 +632,7 @@ QUICK BUILD (QUICK) <scalacfork destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - params="${scalac.args.quick} -Xplugin:${build-quick.dir}/plugins/continuations.jar -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.quick} -Xpluginsdir ${build-quick.dir}/plugins -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1135,7 +1135,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.quick} -Xplugin:${build-strap.dir}/plugins/continuations.jar -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.quick} -Xpluginsdir ${build-quick.dir}/plugins -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1553,7 +1553,7 @@ BOOTRAPING TEST AND TEST SUITE <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="2400000" javaccmd="${javac.cmd}" srcdir="${partest.srcdir}" - scalacopts="${scalac.args.optimise} -Xplugin:${build-pack.dir}/plugins/continuations.jar -Xplugin-require:continuations -P:continuations:enable"> + scalacopts="${scalac.args.optimise} -Xpluginsdir ${build-quick.dir}/plugins -Xplugin-require:continuations -P:continuations:enable"> <compilationpath> <path refid="pack.classpath"/> <fileset dir="${partest.dir}/files/lib" includes="*.jar" /> |