From 7620e2d34b1ea9be56f7d76a450d6827de9bc433 Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 19 Jun 2007 09:31:30 +0000 Subject: fixed name in .NET script --- src/mono/bin/scalac-net.bat | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/mono/bin/scalac-net.bat b/src/mono/bin/scalac-net.bat index 5f15553964..4c5d299c65 100755 --- a/src/mono/bin/scalac-net.bat +++ b/src/mono/bin/scalac-net.bat @@ -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% ) -- cgit v1.2.3