corrected Windows tool template to match corres...

corrected Windows tool template to match corresponding Unix template
reordered path variables in this order: EXTENSION, BOOT and MY

2 files changed, 11 insertions, 32 deletions

diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 766864d183..cf1837371d 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -32,9 +32,6 @@ SCALA_HOME=`dirname "$SOURCE"`/..;
 SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
 
 EXTENSION_CLASSPATH="@extclasspath@"
-BOOT_CLASSPATH="@bootclasspath@"
-USER_ARGS=""
-
 if [ "$EXTENSION_CLASSPATH" == "" ] ; then
     for jar in `ls $SCALA_HOME/lib/*.jar` ; do
         EXTENSION_CLASSPATH="$EXTENSION_CLASSPATH:$jar"
@@ -42,13 +39,12 @@ if [ "$EXTENSION_CLASSPATH" == "" ] ; then
     EXTENSION_CLASSPATH=${EXTENSION_CLASSPATH:1}
 fi
 
-MYCLASSPATH="$EXTENSION_CLASSPATH"
-
 BOOT_CLASSPATH=""
 if [ -f "$SCALA_HOME/lib/scala-library.jar" ] ; then
     BOOT_CLASSPATH="$SCALA_HOME/lib/scala-library.jar"
 fi
 
+MYCLASSPATH="$EXTENSION_CLASSPATH"
 if [ "$BOOT_CLASSPATH" != "" ] ; then
     if [ "$MYCLASSPATH" == "" ] ; then
         MYCLASSPATH="$BOOT_CLASSPATH"
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
index 280f7a5bbb..0429535258 100644
--- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
@@ -25,58 +25,41 @@ 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=
-if not "%_CLASSPATH%"=="" goto args
-for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f"
+set _MYCLASSPATH=%_EXTENSION_CLASSPATH%
+if not "%_BOOT_CLASSPATH%"=="" set _MYCLASSPATH=%_BOOT_CLASSPATH%;%_MYCLASSPATH%
 
-:args
 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 _USER_CLASSPATH=%1
-shift
-goto :loop
-
 :exec
 set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" -Dscala.tool.name="@name@" -Dscala.tool.version="@version@" @properties@
 
-rem set _CLASSPATH=%_USER_CLASSPATH%;%_CLASSPATH%
-rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ -classpath %_USER_CLASSPATH% %_ARGS%
-%_JAVACMD% @javaflags@ %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ -classpath %_USER_CLASSPATH% %_ARGS%
+rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp "%_MYCLASSPATH%" @class@ @toolflags@ %_ARGS%
+%_JAVACMD% @javaflags@ %_PROPS% -cp "%_MYCLASSPATH%" @class@ @toolflags@ %_ARGS%
 goto end
 
 :version
 echo @name@ version @version@ -- @copyright@
 goto end
 
-:help
-echo @name@ version @version@ -- @copyright@
-goto end
-
 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