diff options
| author | michelou <michelou@epfl.ch> | 2006-03-22 17:55:28 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-03-22 17:55:28 +0000 |
| commit | 23b23e99f8858340c7d74e58a376d453d144dff7 (patch) | |
| tree | 9c3310eec5b3f5ea9fa1b231a735e9def3faf4a5 | |
| parent | 0558b4ffd9cd0b993b18ed0df5cd4ab677e6932e (diff) | |
| download | scala-23b23e99f8858340c7d74e58a376d453d144dff7.tar.gz scala-23b23e99f8858340c7d74e58a376d453d144dff7.tar.bz2 scala-23b23e99f8858340c7d74e58a376d453d144dff7.zip | |
adapted Window generic template to correspondin...
adapted Window generic template to corresponding Unix template
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-windows.tmpl | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl index b96a8045f0..e9c29ef3e7 100644 --- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl @@ -25,17 +25,13 @@ set _JAVACMD=%JAVACMD% if "%_JAVACMD%"=="" set _JAVACMD=java set _EXTENSION_CLASSPATH=@extclasspath@ -set _BOOT_CLASSPATH= +if "%_EXTENSION_CLASSPATH%"=="" for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" -rem We use the value of the CLASSPATH environment variable if defined -set _USER_CLASSPATH=%CLASSPATH% -if "%_USER_CLASSPATH%"=="" set _USER_CLASSPATH=. +set _BOOT_CLASSPATH= +if exist "%_SCALA_HOME%/lib/scala-library.jar" set _BOOT_CLASSPATH=%_SCALA_HOME%/lib/scala-library.jar -set _CLASSPATH=@classpath@ -if not "%_CLASSPATH%"=="" goto args -for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" +set _USER_CLASSPATH=. -:args set _ARGS= :loop if "%1"=="" goto exec @@ -54,11 +50,13 @@ shift goto :loop :exec -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.class.path="%_CLASSPATH%" -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" @properties@ +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@ -set _CLASSPATH=%_USER_CLASSPATH%;%_CLASSPATH% -rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp %_CLASSPATH% %_ARGS% -%_JAVACMD% @javaflags@ %_PROPS% -cp %_CLASSPATH% %_ARGS% +rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp %_MYCLASSPATH% %_ARGS% +%_JAVACMD% @javaflags@ %_PROPS% -cp %_MYCLASSPATH% %_ARGS% goto end :version @@ -75,10 +73,10 @@ rem ########################################################################## rem # subroutines :add_cpath - if "%_CLASSPATH%"=="" ( - set _CLASSPATH=%~1 + if "%_EXTENSION_CLASSPATH%"=="" ( + set _EXTENSION_CLASSPATH=%~1 ) else ( - set _CLASSPATH=%_CLASSPATH%;%~1 + set _EXTENSION_CLASSPATH=%_EXTENSION_CLASSPATH%;%~1 ) goto :eof |