diff options
| author | Paul Phillips <paulp@improving.org> | 2011-11-18 16:53:09 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-11-18 16:53:09 +0000 |
| commit | e386ebdff8a1641dbe73cd84915ef9d5231db5d0 (patch) | |
| tree | d7733a6a89da100622f62903180169948e91b3e8 /build.xml | |
| parent | 7c2c8c8adf15e072bf94cfa17ad9b2e1771e3b03 (diff) | |
| download | scala-e386ebdff8a1641dbe73cd84915ef9d5231db5d0.tar.gz scala-e386ebdff8a1641dbe73cd84915ef9d5231db5d0.tar.bz2 scala-e386ebdff8a1641dbe73cd84915ef9d5231db5d0.zip | |
Revert "Enable the use of spaces in paths for t...
Revert "Enable the use of spaces in paths for the Scala build on
Windows."
This reverts the previous commit due to failure to build:
BUILD FAILED
/scratch/trunk1/build.xml:639: scalacfork doesn't support the nested "compilerarg" element.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -634,13 +634,11 @@ QUICK BUILD (QUICK) <scalacfork destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - params="${scalac.args.quick} -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.quick} -Xpluginsdir ${build-quick.dir}/misc/scala-devel/plugins -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath refid="quick.compilation.path"/> - <compilerarg value="-Xpluginsdir"/> - <compilerarg file="${build-quick.dir}/misc/scala-devel/plugins"/> </scalacfork> <touch file="${build-quick.dir}/plugins.complete" verbose="no"/> <stopwatch name="quick.plugins.timer" action="total"/> @@ -1149,13 +1147,11 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all} -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.all} -Xpluginsdir ${build-strap.dir}/misc/scala-devel/plugins -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath refid="strap.compilation.path"/> - <compilerarg value="-Xpluginsdir"/> - <compilerarg file="${build-strap.dir}/misc/scala-devel/plugins"/> </scalacfork> <touch file="${build-strap.dir}/plugins.complete" verbose="no"/> <stopwatch name="strap.plugins.timer" action="total"/> |