summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml13
-rwxr-xr-xsrc/mono/bin/scalac-net.bat22
2 files changed, 23 insertions, 12 deletions
diff --git a/build.xml b/build.xml
index da126ac298..88b0e6806b 100644
--- a/build.xml
+++ b/build.xml
@@ -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%
)