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.

1 files changed, 8 insertions, 0 deletions

diff --git a/build.xml b/build.xml
index accaa92ec0..0badd57afc 100644
--- a/build.xml
+++ b/build.xml
@@ -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"/>