fixed name in .NET script

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@12075 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2007-06-19 09:31:30 +00:00
parent 047ea73713
commit 41c2a36217
2 changed files with 23 additions and 12 deletions

View File

@ -785,7 +785,7 @@ MSIL
<copy todir="${quick.dir}/bin">
<fileset
dir="${mono.dir}/bin"
includes="*-net*"
includes="scala-net*"
/>
<filterset>
<filter token="VERSION" value="${version.number}"/>
@ -793,6 +793,17 @@ MSIL
<filter token="NAME" value="Scala code runner"/>
</filterset>
</copy>
<copy todir="${quick.dir}/bin">
<fileset
dir="${mono.dir}/bin"
includes="scalac-net*"
/>
<filterset>
<filter token="VERSION" value="${version.number}"/>
<filter token="COPYRIGHT" value="${copyright.string}"/>
<filter token="NAME" value="Scala compiler"/>
</filterset>
</copy>
<chmod perm="ugo+rx"
dir="${quick.dir}/bin" includes="*-net*"/>
<if><isset property="os.win"/>

View File

@ -34,16 +34,6 @@ rem We use the value of the JAVA_OPTS environment variable if defined
set _JAVA_OPTS=%JAVA_OPTS%
if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx256M -Xms16M
rem We use the value of the ILASM environment variable if defined
set _ILASM=%ILASM%
if "%_ILASM%"=="" (
if exist "%MONO_HOME%" (
set _ILASM=%MONO_HOME%\bin\ilasm.bat
) else (
call :find_ilasm ilasm.bat
)
)
set _EXTENSION_CLASSPATH=
if "%_EXTENSION_CLASSPATH%"=="" (
for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f"
@ -61,8 +51,18 @@ if "%_BOOT_CLASSPATH%"=="" (
set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\library
)
)
rem We use the value of the ILASM environment variable if defined
set _ILASM=%ILASM%
if "%_ILASM%"=="" (
if exist "%MONO_HOME%" (
set _ILASM=%MONO_HOME%\bin\ilasm.bat
) else (
call :find_ilasm ilasm.bat
)
)
set _MSIL_LIBPATH=%_SCALA_HOME%\lib\predef.dll;%_SCALA_HOME%\lib\scalaruntime.dll;%_SCALA_HOME%\lib\mscorlib.dll
set _MSIL_LIBPATH=%_SCALA_HOME%\lib\predef.dll;%_SCALA_HOME%\lib\scalaruntime.dll;%_SCALA_HOME%\lib\mscorlib.dll
if not "%MONO_PATH%"=="" (
set _MSIL_LIBPATH=%_MSIL_LIBPATH%;%MONO_PATH%
)