diff options
author | Stefan Zeiger <szeiger@novocode.com> | 2011-11-18 18:54:24 +0000 |
---|---|---|
committer | Stefan Zeiger <szeiger@novocode.com> | 2011-11-18 18:54:24 +0000 |
commit | 47c9911a12ac03f6b2bba72016b6d79847198797 (patch) | |
tree | ea815f356181d039680be7538f5274568007ec2b /build.xml | |
parent | e386ebdff8a1641dbe73cd84915ef9d5231db5d0 (diff) | |
download | scala-47c9911a12ac03f6b2bba72016b6d79847198797.tar.gz scala-47c9911a12ac03f6b2bba72016b6d79847198797.tar.bz2 scala-47c9911a12ac03f6b2bba72016b6d79847198797.zip |
Enable the use of spaces in paths for the Scala...
Enable the use of spaces in paths for the Scala build on Windows -- take 2.
(The original commit in r26026, reverted in r26027, used the new
compilerargs
element in the Scala build -- we cannot do this until it's in starr.)
- 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. - Fix space handling in
get-scala-revision.bat.
Closes SI-3047.
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -639,6 +639,10 @@ QUICK BUILD (QUICK) jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath refid="quick.compilation.path"/> + <!-- TODO: Enable this and remove from params above when "compilerarg" is in starr + <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"/> @@ -1152,6 +1156,10 @@ BOOTSTRAPPING BUILD (STRAP) jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath refid="strap.compilation.path"/> + <!-- TODO: Enable this and remove from params above when "compilerarg" is in starr + <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"/> |