diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-06-22 18:54:09 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-06-22 18:54:09 +0000 |
| commit | 57209b7bf02ecd7dabab8a9819b018f1c486665a (patch) | |
| tree | 4a7b192bddc182ca87bd9bf9649cf240f5d31681 /src | |
| parent | 71d6e44fde734f9b76b843e5630633920d2e6b88 (diff) | |
| download | scala-57209b7bf02ecd7dabab8a9819b018f1c486665a.tar.gz scala-57209b7bf02ecd7dabab8a9819b018f1c486665a.tar.bz2 scala-57209b7bf02ecd7dabab8a9819b018f1c486665a.zip | |
fix (?) for windows runner scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 10 |
1 files changed, 5 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 8367d97f5b..ed4ea055f0 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -27,9 +27,9 @@ if "%OS%"=="Windows_NT" ( rem We use the value of the JAVACMD environment variable if defined
set _JAVACMD=%JAVACMD%
-if "%_JAVACMD%" == "" (
- if not %JAVA_HOME% == "" (
- if exist %JAVA_HOME%\bin\java.exe set _JAVACMD="%JAVA_HOME%\bin\java.exe"
+if "%_JAVACMD%"=="" (
+ if not "%JAVA_HOME%"=="" (
+ if exist "%JAVA_HOME%\bin\java.exe" set _JAVACMD=%JAVA_HOME%\bin\java.exe
)
)
@@ -49,8 +49,8 @@ if "%_TOOL_CLASSPATH%"=="" ( set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.classpath="%CLASSPATH%" -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@ %_ARGS%
+"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %_ARGS%
goto end
rem ##########################################################################
|