diff options
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index c5f369eafa..679fa028eb 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -10,10 +10,9 @@ rem ########################################################################## if "%OS%"=="Windows_NT" ( @@setlocal - set _SCALA_HOME=%~dp0.. + set SCALA_HOME=%~dp0..% ) else ( - set _SCALA_HOME=%SCALA_HOME% - if "%_SCALA_HOME%"=="" goto error1 + if "%SCALA_HOME%"=="" goto error1 ) set _JAVACMD=%JAVACMD% @@ -22,7 +21,7 @@ set _JAVAFLAGS=@javaflags@ set _CLASSPATH=@classpath@ if not "%_CLASSPATH%"=="" goto args -for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" +for %%f in ("%SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" :args set _ARGS= @@ -34,7 +33,7 @@ shift goto loop :exec -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.tool.name="@name@" -Dscala.tool.version="@version@" @properties@ +set _PROPS=-Dscala.home="%SCALA_HOME%" -Dscala.tool.name="@name@" -Dscala.tool.version="@version@" @properties@ rem echo %_JAVACMD% %_JAVAFLAGS% %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ %_ARGS% %_JAVACMD% %_JAVAFLAGS% %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ %_ARGS% |