diff options
author | Paul Phillips <paulp@improving.org> | 2011-11-18 15:16:26 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-11-18 15:16:26 +0000 |
commit | 7c2c8c8adf15e072bf94cfa17ad9b2e1771e3b03 (patch) | |
tree | be050afb479ff50334cf2f13fbbb181b30808855 /build.xml | |
parent | 955b852dfd9515c5b9ea1950d047db08140ba007 (diff) | |
download | scala-7c2c8c8adf15e072bf94cfa17ad9b2e1771e3b03.tar.gz scala-7c2c8c8adf15e072bf94cfa17ad9b2e1771e3b03.tar.bz2 scala-7c2c8c8adf15e072bf94cfa17ad9b2e1771e3b03.zip |
Enable the use of spaces in paths for the Scala...
Enable the use of spaces in paths for the Scala build on Windows.
Revert r25995 which was fixing it only partly and in the wrong place.
Properly encode argument files for scalac in scalac ant task. Allow
'compilerarg' elements in scalac ant task (like in ant's built-in javac
task) to allow passing extra parameters like plugindir path with proper
encoding of spaces and file names, and use it in the Scala build. Fix
space handling in get-scala-revision.bat.
(Patch by Stefan Zeiger.) Closes SI-3047.
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -634,11 +634,13 @@ QUICK BUILD (QUICK) <scalacfork destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - params="${scalac.args.quick} -Xpluginsdir ${build-quick.dir}/misc/scala-devel/plugins -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.quick} -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"/> @@ -1147,11 +1149,13 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all} -Xpluginsdir ${build-strap.dir}/misc/scala-devel/plugins -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.all} -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"/> |