diff options
| -rw-r--r-- | build.xml | 6 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 3 |
2 files changed, 6 insertions, 3 deletions
@@ -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> diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index b9b8682efb..cd6139aa8c 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/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@ |