- added a missing %
- use SCALA_HOME instead of _SCALA_HOME, for consistency with the Unix template git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5859 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
5561f95d14
commit
dd2a42c092
|
@ -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%
|
||||
|
|
Loading…
Reference in New Issue