diff options
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/tool-windows.tmpl')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 0429535258..fc2a784d32 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -25,18 +25,25 @@ set _JAVACMD=%JAVACMD% if "%_JAVACMD%"=="" set _JAVACMD=java set _EXTENSION_CLASSPATH=@extclasspath@ -if "%_EXTENSION_CLASSPATH%"=="" for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" +if "%_EXTENSION_CLASSPATH%"=="" ( + for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" +) -set _BOOT_CLASSPATH= -if exist "%_SCALA_HOME%/lib/scala-library.jar" set _BOOT_CLASSPATH=%_SCALA_HOME%/lib/scala-library.jar +set _BOOT_CLASSPATH=@bootclasspath@ +if "%_BOOT_CLASSPATH%"=="" ( + if exist "%_SCALA_HOME%\lib\scala-library.jar" ( + set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\scala-library.jar + ) +) set _MYCLASSPATH=%_EXTENSION_CLASSPATH% if not "%_BOOT_CLASSPATH%"=="" set _MYCLASSPATH=%_BOOT_CLASSPATH%;%_MYCLASSPATH% set _ARGS= :loop -if "%1"=="" goto exec -if "%1"=="-version" goto version +rem Argument %1 may contain quotes so we use parentheses here +if (%1)==() goto exec +if (%1)==(-version) goto version set _ARGS=%_ARGS% %1 shift goto loop |