summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-11-18 15:16:26 +0000
committerPaul Phillips <paulp@improving.org>2011-11-18 15:16:26 +0000
commit7c2c8c8adf15e072bf94cfa17ad9b2e1771e3b03 (patch)
treebe050afb479ff50334cf2f13fbbb181b30808855 /tools
parent955b852dfd9515c5b9ea1950d047db08140ba007 (diff)
downloadscala-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 '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%