diff options
| author | michelou <michelou@epfl.ch> | 2006-03-28 22:35:47 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-03-28 22:35:47 +0000 |
| commit | 99c2f95fcfbdd63a22672ff9e929d3ee2b2a678f (patch) | |
| tree | b8482b02421709bedad2b9dfaff81c490a43667c | |
| parent | 65f9252a9ae23c5091bd898bb66e3d8227992718 (diff) | |
| download | scala-99c2f95fcfbdd63a22672ff9e929d3ee2b2a678f.tar.gz scala-99c2f95fcfbdd63a22672ff9e929d3ee2b2a678f.tar.bz2 scala-99c2f95fcfbdd63a22672ff9e929d3ee2b2a678f.zip | |
corrected "%1"=="" to (%1)==() in file generic-...
corrected "%1"=="" to (%1)==() in file generic-windows.tmpl
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-windows.tmpl | 6 |
1 files changed, 4 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 02d3c1fe6e..8c552132e7 100644 --- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl @@ -36,6 +36,7 @@ if "%_BOOT_CLASSPATH%"=="" ( ) ) +rem We use the value of the CLASSPATH environment variable if defined set _USER_CLASSPATH=%CLASSPATH% if "%_USER_CLASSPATH%"=="" set _USER_CLASSPATH=. @@ -52,7 +53,7 @@ goto loop :cpath shift -if "%1"=="" goto help +if (%1)==() goto help set _USER_CLASSPATH=%1 shift goto :loop @@ -61,7 +62,8 @@ goto :loop if not "%_EXTENSION_CLASSPATH%"=="" set _MYCLASSPATH=%_USER_CLASSPATH%;%_EXTENSION_CLASSPATH% if not "%_BOOT_CLASSPATH%"=="" set _MYCLASSPATH=%_BOOT_CLASSPATH%;%_MYCLASSPATH% -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.class.path="%_USER_CLASSPATH%" -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" @properties@ +rem Variable _USER_CLASSPATH is set to CLASSPATH, %1 or . and DO NOT need to be quoted +set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.class.path=%_USER_CLASSPATH% -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" @properties@ rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp %_MYCLASSPATH% %_ARGS% %_JAVACMD% @javaflags@ %_PROPS% -cp %_MYCLASSPATH% %_ARGS% |