From 869e5e9793f19c470daf93ada44c56a7852d57c3 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Mon, 4 Apr 2011 14:52:55 +0000 Subject: Fix for windows batch files. Closes #4439. --- src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src') 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 ########################################################################## -- cgit v1.2.3