EXTENSION_CLASSPATH now contains both files/dirs on Windows

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@8165 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

build.xml

@@ -245,12 +245,12 @@ BUILD SUPPORT MACROS
     <attribute name="build.dir"/>
     <sequential>
       <if><not><available file="@{build.dir}/lib/fjbg.jar"/></not><then>
-        <if><isset property="os.unix"/><then>
+        <if><isset property="os.win"/><then>
+          <copy file="${fjbg.jar}" tofile="@{build.dir}/lib/fjbg.jar"/>
+        </then><else>
           <symlink
             link="@{build.dir}/lib/fjbg.jar"
             resource="${fjbg.jar}" overwrite="yes" failonerror="no"/>
-        </then><else>
-          <copy file="${fjbg.jar}" tofile="@{build.dir}/lib/fjbg.jar"/>
         </else></if>
       </then></if>
     </sequential>

src/compiler/scala/tools/ant/templates/tool-windows.tmpl

@@ -27,6 +27,9 @@ if "%_JAVACMD%"=="" set _JAVACMD=java
 set _EXTENSION_CLASSPATH=@extclasspath@
 if "%_EXTENSION_CLASSPATH%"=="" (
   for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f"
+  if "%OS%"=="Windows_NT" (
+    for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f"
+  )
 )
 
 set _BOOT_CLASSPATH=@bootclasspath@