summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-07-27 15:40:35 +0000
committermichelou <michelou@epfl.ch>2007-07-27 15:40:35 +0000
commiteb21be47d8e2fe834fce71aaed59cac129410699 (patch)
tree510a42be0b8d9f5a1362b651c73bc19fc85b61d0
parent5327a60d2007cdbb0ddf7cab29027e8e8c6698c3 (diff)
downloadscala-eb21be47d8e2fe834fce71aaed59cac129410699.tar.gz
scala-eb21be47d8e2fe834fce71aaed59cac129410699.tar.bz2
scala-eb21be47d8e2fe834fce71aaed59cac129410699.zip
Updated STARR to Scala-2.6.0-RC1
-rw-r--r--build.number4
-rw-r--r--build.xml2
-rw-r--r--lib/scala-compiler.jar.desired.sha12
-rw-r--r--lib/scala-library-src.jar.desired.sha12
-rw-r--r--lib/scala-library.jar.desired.sha12
5 files changed, 6 insertions, 6 deletions
diff --git a/build.number b/build.number
index 5c4a96385c..9e68dd4b88 100644
--- a/build.number
+++ b/build.number
@@ -1,5 +1,5 @@
#Mon May 21 14:17:57 CEST 2007
-version.minor=5
-version.patch=1
+version.minor=6
+version.patch=0
version.suffix=-RC1
version.major=2
diff --git a/build.xml b/build.xml
index 3753ac6e5f..c0c2b31ddb 100644
--- a/build.xml
+++ b/build.xml
@@ -1400,7 +1400,7 @@ GENERATES A DISTRIBUTION
includes="clitest,diff/diff.*,diff/lib*.dll,scalatest,scalatest.bat"/>
<miscset
dir="${basedir}/test"
- includes="files/**/*.args,files/**/*.check,files/**/*.jar,files/**/*.java,files/**/*.scala,files/cli/**/*.check.*,files/shootout/*.javaopts,files/shootout/*.runner,files/shootout/*.txt"/>
+ includes="files/**/*.args,files/**/*.check,files/**/*.jar,files/**/*.java,files/**/*.scala,files/cli/**/*.check.*,files/jvm/*.so,files/shootout/*.javaopts,files/shootout/*.runner,files/shootout/*.txt"/>
</quicksbaz>
<!-- Creates the MSIL package -->
<quicksbaz
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 631dabecfd..a98eb9ad96 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-8c936ee5e1c91311720fba6eeb8c6e21846497e7 ?scala-compiler.jar
+f0025488b286c4b57d015878d5f0902aac5fd58d ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index f5a7b89db5..d69dbc8e53 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-e250d75f0f0d815b3ef01e8532fc36ce53779e5d ?scala-library-src.jar
+efebc42f00d8b5524dd1efbb3f65f261e62a02a6 ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 688547121a..3b017753df 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-10518e51a1f375e7f6822caeeea1a139ce9a0eae ?scala-library.jar
+6488189d23cfcd76ea1bdc980cd750fea0023dba ?scala-library.jar