From 4fe80dadef50cfa2d5ca20a5dbae92403d64fba3 Mon Sep 17 00:00:00 2001 From: Lex Spoon Date: Fri, 1 Dec 2006 11:12:48 +0000 Subject: Fixed a bug with processing the SCALA_HOME envi... Fixed a bug with processing the SCALA_HOME environment variable, as suggested by Keith Hodel --- src/compiler/scala/tools/ant/templates/generic-windows.tmpl | 4 +++- src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.3