diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-03-24 13:14:39 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-03-24 13:14:39 +0000 |
| commit | 9257aeb98b5d67645dd67e399023f2ff04d90498 (patch) | |
| tree | dc3200583f88bc83bb105e70f493eefea07fa949 | |
| parent | 5a820a97086a0b35efe1c9f91e8e4b9cc3578ebd (diff) | |
| download | scala-9257aeb98b5d67645dd67e399023f2ff04d90498.tar.gz scala-9257aeb98b5d67645dd67e399023f2ff04d90498.tar.bz2 scala-9257aeb98b5d67645dd67e399023f2ff04d90498.zip | |
fixed msil build; currently exclude new collect...
fixed msil build; currently exclude new collection library
| -rw-r--r-- | lib/msil.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/build/msil.xml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/msil.jar.desired.sha1 b/lib/msil.jar.desired.sha1 index b20feb2eb3..0079fc4d47 100644 --- a/lib/msil.jar.desired.sha1 +++ b/lib/msil.jar.desired.sha1 @@ -1 +1 @@ -598dd638e05479b45cfac0d952cf1f14337725fc ?msil.jar +b73c6a7eafee8d31d7ddf4066dd8f640163939b6 ?msil.jar diff --git a/src/build/msil.xml b/src/build/msil.xml index e020537a46..1f4e610c76 100644 --- a/src/build/msil.xml +++ b/src/build/msil.xml @@ -100,13 +100,15 @@ MSIL BUILD will then have a new timestamp, and be recompiled --> <mkdir dir="${build-msil-src.dir}"/> <copy todir="${build-msil-src.dir}" overwrite="true"> - <fileset dir="${src.dir}/library"> + <!-- FIXME: include new collection library --> + <fileset dir="${src.dir}/library" excludes="scalax/**"> <and> <present present="srconly" targetdir="${src.dir}/dotnet-library"/> <different targetdir="${build-msil-src.dir}" ignoreFileTimes="true"/> </and> </fileset> - <fileset dir="${src.dir}/dotnet-library"> + <!-- FIXME: include new collection library --> + <fileset dir="${src.dir}/dotnet-library" excludes="scalax/**"> <different targetdir="${build-msil-src.dir}" ignoreFileTimes="true"/> </fileset> </copy> |