diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-04 14:52:55 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-04 14:52:55 +0000 |
| commit | 869e5e9793f19c470daf93ada44c56a7852d57c3 (patch) | |
| tree | 222065e48b36692b8616670ea99d3c55d4fa57d7 /src | |
| parent | a6894562537890709b2f95385107710a284a9edb (diff) | |
| download | scala-869e5e9793f19c470daf93ada44c56a7852d57c3.tar.gz scala-869e5e9793f19c470daf93ada44c56a7852d57c3.tar.bz2 scala-869e5e9793f19c470daf93ada44c56a7852d57c3.zip | |
Fix for windows batch files. Closes #4439.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index a5fd17a7a9..21651831df 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -15,14 +15,6 @@ if "%OS%" NEQ "Windows_NT" ( @@setlocal
call :set_home
-set _ARGS=
-:loop
- rem Argument %1 may contain quotes so we use parentheses here
- if (%1)==() goto :looped
- set _ARGS=%_ARGS% %1
- shift
-goto loop
-:looped
rem We use the value of the JAVACMD environment variable if defined
set _JAVACMD=%JAVACMD%
@@ -47,8 +39,8 @@ if "%_TOOL_CLASSPATH%"=="" ( set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.emacs="%EMACS%" @properties@
-rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %_ARGS%
-"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %_ARGS%
+rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*
+"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*
goto end
rem ##########################################################################
|