diff options
| author | Lex Spoon <lex@lexspoon.org> | 2006-12-01 11:12:48 +0000 |
|---|---|---|
| committer | Lex Spoon <lex@lexspoon.org> | 2006-12-01 11:12:48 +0000 |
| commit | 4fe80dadef50cfa2d5ca20a5dbae92403d64fba3 (patch) | |
| tree | 58da2158eaf0c0a9657c2f108f856780910b9250 /src | |
| parent | 6090bd23285c1001eedad2a320c2a6d0ffc0698d (diff) | |
| download | scala-4fe80dadef50cfa2d5ca20a5dbae92403d64fba3.tar.gz scala-4fe80dadef50cfa2d5ca20a5dbae92403d64fba3.tar.bz2 scala-4fe80dadef50cfa2d5ca20a5dbae92403d64fba3.zip | |
Fixed a bug with processing the SCALA_HOME envi...
Fixed a bug with processing the SCALA_HOME environment variable, as
suggested by Keith Hodel
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-windows.tmpl | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl index 22fb9faf38..3164a3a0ba 100644 --- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl @@ -19,7 +19,9 @@ if "%OS%"=="Windows_NT" ( call :set_home
) else (
set _SCALA_HOME=%SCALA_HOME%
- if "%_SCALA_HOME%"=="" goto error1
+ rem The following line tests SCALA_HOME instead of _SCALA_HOME, because
+ rem the above change to _SCALA_HOME is not visible within this block.
+ if "%SCALA_HOME%"=="" goto error1
)
rem We use the value of the JAVACMD environment variable if defined
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index b86aa851c1..56e582b5ea 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -19,7 +19,9 @@ if "%OS%"=="Windows_NT" ( call :set_home
) else (
set _SCALA_HOME=%SCALA_HOME%
- if "%_SCALA_HOME%"=="" goto error1
+ rem The following line tests SCALA_HOME instead of _SCALA_HOME, because
+ rem the above change to _SCALA_HOME is not visible within this block.
+ if "%SCALA_HOME%"=="" goto error1
)
rem We use the value of the JAVACMD environment variable if defined
|