diff options
| -rw-r--r-- | build.xml | 44 | ||||
| -rw-r--r-- | lib/scalaruntime.dll | bin | 0 -> 4608 bytes | |||
| -rwxr-xr-x | test/scalatest | 2 |
3 files changed, 45 insertions, 1 deletions
@@ -51,6 +51,7 @@ PROPERTIES <property name="api-comp.dir" value="${build.dir}/api-compiler"/> <property name="tooldocs.dir" value="${build.dir}/tooldocs"/> <property name="examples.dir" value="${build.dir}/examples"/> + <property name="msil.dir" value="${build.dir}/msil"/> <!-- Sets location and structure of the distribution --> <property name="dist.dir" value="${basedir}/dists"/> <property name="lib.jar.name" value="scala-library.jar"/> @@ -551,6 +552,49 @@ BUILD QUICK-TEST LAYER </target> <!-- =========================================================================== +MSIL +============================================================================ --> + + <target name="msil.sources"> + <mkdir dir="${msil.dir}/src"/> + + <copy todir="${msil.dir}/src"> + <fileset dir="${src.dir}/library" includes="**/*.scala"> + <not> + <present targetdir="${src.dir}/dotnet-library"/> + </not> + </fileset> + </copy> + + <copy todir="${msil.dir}/src"> + <fileset dir="${src.dir}/dotnet-library"> + <include name="**/*.scala"/> + </fileset> + </copy> + + </target> + + <target name="msil.predef" depends="setup.quick, msil.sources"> + <quick srcdir="${msil.dir}/src" usepredefs="no" target="msil" + assemname="predef" assemrefs="${lib.dir}"> + <include name="scala/Predef.scala" /> + <include name="scala/Console.scala" /> + <include name="scala/Application.scala" /> + <include name="scala/ByNameFunction.scala" /> + <include name="scala/*Attribute.scala" /> + <include name="scala/Function*.scala" /> + <include name="scala/Tuple*.scala" /> + <include name="scala/Product*.scala" /> + <include name="scala/deprecated.scala" /> + <include name="scala/serializable.scala" /> + <include name="scala/transient.scala" /> + <include name="scala/cloneable.scala" /> + <include name="scala/transient.scala" /> + <include name="scala/runtime/*.scala" /> + </quick> + </target> + +<!-- =========================================================================== TEST ============================================================================ --> diff --git a/lib/scalaruntime.dll b/lib/scalaruntime.dll Binary files differnew file mode 100644 index 0000000000..43c0a1cc24 --- /dev/null +++ b/lib/scalaruntime.dll diff --git a/test/scalatest b/test/scalatest index a9dc13cc79..38fe3814c5 100755 --- a/test/scalatest +++ b/test/scalatest @@ -282,7 +282,7 @@ test_run_msil() { rm -f "$dstbase".$EXE && $SCALAC -nowarn -target:msil -o "$os_dstbase" -r $assemblies "$@" \ - -sourcepath "$PREFIX/src/dotnet-library" "$os_srcbase".scala && + -sourcepath "$PREFIX/build/msil/src" "$os_srcbase".scala && case "$UNAME" in CYGWIN* ) ilasm /qui /nol /out="$os_dstbase".$EXE "$os_dstbase".$MSIL \ |