summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2005-12-22 01:45:39 +0000
committermichelou <michelou@epfl.ch>2005-12-22 01:45:39 +0000
commit212ae85d015ac25fd49f34b3620b4c37740c3167 (patch)
tree13260308de8048b903cdfb25c13a8521cf2d6daa
parent10322415aeea472260abd25324f707728fe55f4d (diff)
downloadscala-212ae85d015ac25fd49f34b3620b4c37740c3167.tar.gz
scala-212ae85d015ac25fd49f34b3620b4c37740c3167.tar.bz2
scala-212ae85d015ac25fd49f34b3620b4c37740c3167.zip
- corrected value of SCALA_HOME
-rw-r--r--src/exec/scala-tool.win.tmpl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/exec/scala-tool.win.tmpl b/src/exec/scala-tool.win.tmpl
index 75db644099..7b87904f9a 100644
--- a/src/exec/scala-tool.win.tmpl
+++ b/src/exec/scala-tool.win.tmpl
@@ -9,9 +9,9 @@ rem # PARTICULAR PURPOSE.
rem ##########################################################################
if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="Windows_NT" @set SCALA_HOME=%~dp0
+if "%OS%"=="Windows_NT" @set SCALA_HOME=%~dp0..
-if "%SCALA_HOME%" == "" goto error1
+if "%SCALA_HOME%"=="" goto error1
set _ARGS=
:loop
@@ -25,9 +25,9 @@ set _JAVACMD=java
set _MAIN=@tool.class@
set _TOOLS_CPATH=@fjbg.jar@;@msil.jar@;@comp.path@;@lib.path@
set _LIB_CPATH=@lib.path@
-set _PROPS=-Dscala.version=@version@ -Dscala.home=%SCALA_HOME% -Dscala.boot.class.path="%_LIB_CPATH%"
+set _PROPS=-Dscala.version=@version@ -Dscala.home="%SCALA_HOME%" -Dscala.boot.class.path="%_LIB_CPATH%"
-rem echo %_JAVACMD% %_PROPS% -cp %_CPATH% %_MAIN% %_ARGS%
+rem echo %_JAVACMD% %_PROPS% -cp %_TOOLS_CPATH% %_MAIN% %_ARGS%
%_JAVACMD% %_PROPS% -cp %_TOOLS_CPATH% %_MAIN% %_ARGS%
goto end