diff options
| author | michelou <michelou@epfl.ch> | 2006-02-22 17:56:12 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-02-22 17:56:12 +0000 |
| commit | 7320a81b8a7c7977b2139fa6ce5ebd62b36b3d48 (patch) | |
| tree | c2e83b3b1f923d3dec85036f63f42902f22d4cd0 /src/compiler | |
| parent | 96ae92e4f6f830a9a4e55768c3de0328a2a030ba (diff) | |
| download | scala-7320a81b8a7c7977b2139fa6ce5ebd62b36b3d48.tar.gz scala-7320a81b8a7c7977b2139fa6ce5ebd62b36b3d48.tar.bz2 scala-7320a81b8a7c7977b2139fa6ce5ebd62b36b3d48.zip | |
added support for '-classpath' option in genera...
added support for '-classpath' option in generated file scala.bat
(Windows)
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-windows.tmpl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl index b132b670cc..8b14d2b7ec 100644 --- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl @@ -20,6 +20,7 @@ set _JAVACMD=%JAVACMD% if "%_JAVACMD%"=="" set _JAVACMD=java set _JAVAFLAGS=@javaflags@ +set _CPATH=. set _CLASSPATH=@classpath@ if not "%_CLASSPATH%"=="" goto args for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" @@ -28,12 +29,22 @@ for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" set _ARGS= :loop if "%1"=="" goto exec +if "%1"=="-classpath" goto cpath +if "%1"=="-cp" goto cpath if "%1"=="-version" goto version set _ARGS=%_ARGS% %1 shift goto loop +:cpath +shift +if "%1"=="" goto help +set _CPATH=%1 +shift +goto :loop + :exec +set _CLASSPATH=%_CLASSPATH%;%_CPATH% rem echo %_JAVACMD% %_JAVAFLAGS% -cp %_CLASSPATH% %_ARGS% %_JAVACMD% %_JAVAFLAGS% -cp %_CLASSPATH% %_ARGS% goto end @@ -43,6 +54,11 @@ echo Scala runtime version @version@ -- @copyright@ %_JAVACMD% -version goto end +:help +echo Scala runtime version @version@ -- @copyright@ +%_JAVACMD% -help +goto end + rem ########################################################################## rem # subroutines |