diff options
author | michelou <michelou@epfl.ch> | 2007-06-19 09:31:30 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-06-19 09:31:30 +0000 |
commit | 7620e2d34b1ea9be56f7d76a450d6827de9bc433 (patch) | |
tree | 093dad0ff204dc839dc4dadcdc5fdc6f4c3e5c5d | |
parent | 4ce287ec395a4578f5e52240464f91286b6ed97f (diff) | |
download | scala-7620e2d34b1ea9be56f7d76a450d6827de9bc433.tar.gz scala-7620e2d34b1ea9be56f7d76a450d6827de9bc433.tar.bz2 scala-7620e2d34b1ea9be56f7d76a450d6827de9bc433.zip |
fixed name in .NET script
-rw-r--r-- | build.xml | 13 | ||||
-rwxr-xr-x | src/mono/bin/scalac-net.bat | 22 |
2 files changed, 23 insertions, 12 deletions
@@ -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"/> 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%
)
|