diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-13 13:42:41 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-13 13:42:41 +0000 |
commit | 0df17b5003ef3d2546e2e87b926e287cd9723fff (patch) | |
tree | 712a134aae952420d68002cb9f64ff7f3e389510 | |
parent | 1e3c53fc745b6a46b2b329cce615c701bd7cec30 (diff) | |
download | scala-0df17b5003ef3d2546e2e87b926e287cd9723fff.tar.gz scala-0df17b5003ef3d2546e2e87b926e287cd9723fff.tar.bz2 scala-0df17b5003ef3d2546e2e87b926e287cd9723fff.zip |
Reinstated old, trusted starr from r17713.
Modified version number detection, so that
until we have a new starr both 4 and 5 are
acceptable (without warnings).
Restored stability test so that it does
complain if differences are found; however,
a failed stability test is still non-fatal
for the time being.
-rw-r--r-- | build.xml | 4 | ||||
-rw-r--r-- | lib/msil.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala | 11 |
6 files changed, 16 insertions, 7 deletions
@@ -1468,13 +1468,11 @@ BOOTRAPING TEST AND TEST SUITE ============================================================================ --> <target name="test.stability" depends="strap.done"> -<!-- commented out for now. - <same dir="${build-quick.dir}" todir="${build-strap.dir}" failondifferent="yes"> + <same dir="${build-quick.dir}" todir="${build-strap.dir}" failondifferent="no"> <exclude name="**/*.properties"/> <exclude name="bin/**"/> <exclude name="*.complete"/> </same> ---> </target> <target name="test.run" depends="pack.done"> diff --git a/lib/msil.jar.desired.sha1 b/lib/msil.jar.desired.sha1 index 42a4195337..0079fc4d47 100644 --- a/lib/msil.jar.desired.sha1 +++ b/lib/msil.jar.desired.sha1 @@ -1 +1 @@ -1e7819b8f9ef1fd7ee27bd4bc6cb113905c10dde ?msil.jar +b73c6a7eafee8d31d7ddf4066dd8f640163939b6 ?msil.jar diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index 28b0656f22..b8759d191b 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -cf28a94e0d4ab644d58cc866632700bc69fa5a38 ?scala-compiler.jar +6e45b297a30df884614addeb027b5ebf76485f11 ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index af1fc3d5b8..e0ef39b088 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -f88f7d3a832b8ad1912628fe91a4a998a52c4b2f ?scala-library-src.jar +0c72a64d2744d408a66d5207d68951b3389990fc ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index fc58627a8b..b70c4f6b6e 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -0f81f0ec7ef5acafd52999c379e27f9225f107cf ?scala-library.jar +c077142101bb954b29c460580a2450cdc4742ab0 ?scala-library.jar diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala index c09136e9a5..ff000c85d6 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala @@ -68,10 +68,21 @@ abstract class UnPickler { private def checkVersion(filename: String) { val major = readNat() val minor = readNat() + +// remove the portion below, between "cut here", before releasing the first 2.8 beta + //---cut here--- + + // transiently, use this bit as long as stability fails. + if (major != 4 && major != 5) + + // once stability is restored, use the following bit instead: +/* if (major == 4) { // !!! temporarily accept 4 as version. println("WARNING: old class format, please recompile "+filename) } else +*/ + //---cut here--- if (major != MajorVersion || minor > MinorVersion) throw new IOException("Scala signature " + classRoot.name + |