summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Regnell <bjorn.regnell@cs.lth.se>2013-04-11 01:32:44 +0300
committerJason Zaugg <jzaugg@gmail.com>2013-04-23 21:34:32 +0200
commit0d2c7e9a3a3e2c5240ba3015b2a08d7a982f3427 (patch)
treebfaff2929bda64f8fe0ffb5cc3b071a7314cdf54
parent4dcb33e6f527f5e2bf978c9e1ca778c40bf29d54 (diff)
downloadscala-0d2c7e9a3a3e2c5240ba3015b2a08d7a982f3427.tar.gz
scala-0d2c7e9a3a3e2c5240ba3015b2a08d7a982f3427.tar.bz2
scala-0d2c7e9a3a3e2c5240ba3015b2a08d7a982f3427.zip
SI-7355 Handle spaces in paths in Windows batch files.
Changed "%1%" and %2% to "%~1" and %~2 to allow spaces in paths by surrounding quotes according to advice at: http://stackoverflow.com/questions/473117/pass-path-with-spaces-as-parameter-to-bat-file http://ss64.com/nt/syntax-args.html
-rw-r--r--src/compiler/scala/tools/ant/templates/tool-windows.tmpl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
index 411a27b9c7..bd6cf561b9 100644
--- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
@@ -14,8 +14,9 @@ set _LINE_TOOLCP=
:another_param
-if "%1%"=="-toolcp" (
- set _LINE_TOOLCP=%2%
+rem Use "%~1" to handle spaces in paths. See http://ss64.com/nt/syntax-args.html
+if "%~1"=="-toolcp" (
+ set _LINE_TOOLCP=%~2
shift
shift
goto another_param