summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2011-11-18 18:54:24 +0000
committerStefan Zeiger <szeiger@novocode.com>2011-11-18 18:54:24 +0000
commit47c9911a12ac03f6b2bba72016b6d79847198797 (patch)
treeea815f356181d039680be7538f5274568007ec2b /tools
parente386ebdff8a1641dbe73cd84915ef9d5231db5d0 (diff)
downloadscala-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 'tools')
-rw-r--r--tools/get-scala-revision.bat4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/get-scala-revision.bat b/tools/get-scala-revision.bat
index c9de414cea..880bcc3f5c 100644
--- a/tools/get-scala-revision.bat
+++ b/tools/get-scala-revision.bat
@@ -14,9 +14,9 @@ if "%OS%" NEQ "Windows_NT" (
set _DIR=
if "%*"=="" (
- for /f %%i in ('cd') do set _DIR=%%i
+ for /f "delims=;" %%i in ('cd') do set "_DIR=%%i"
) else (
- set _DIR=%~1
+ set "_DIR=%~1"
)
cd %_DIR%