summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2008-10-31 16:30:32 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2008-10-31 16:30:32 +0000
commit09d993827276afdeea567bc3450a68a13526154b (patch)
treef3a3ae9c12c95f6cb6b05ae54c8fe9defd19d605
parent2dbbad7ebcbe7022620191c414fa2ef1e961e188 (diff)
downloadscala-09d993827276afdeea567bc3450a68a13526154b.tar.gz
scala-09d993827276afdeea567bc3450a68a13526154b.tar.bz2
scala-09d993827276afdeea567bc3450a68a13526154b.zip
Updated version number for Scala 2.7.2.RC6
-rw-r--r--META-INF/MANIFEST.MF2
-rw-r--r--build.number2
-rw-r--r--src/build/pack.xml2
-rw-r--r--src/compiler/scala/tools/nsc/doc/script.js2
-rwxr-xr-xtest/files/jvm/natives-32.dllbin49152 -> 40960 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 6956552a48..2cd909a721 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Scala Distribution
Bundle-SymbolicName: scala.tools.nsc;singleton:=true
-Bundle-Version: 2.7.2.RC5
+Bundle-Version: 2.7.2.RC6
Eclipse-LazyStart: true
Bundle-ClassPath:
.,
diff --git a/build.number b/build.number
index 15b2938f28..2c4bd68180 100644
--- a/build.number
+++ b/build.number
@@ -1,5 +1,5 @@
#Tue Sep 11 19:21:09 CEST 2007
version.minor=7
version.patch=2
-version.suffix=RC5
+version.suffix=RC6
version.major=2
diff --git a/src/build/pack.xml b/src/build/pack.xml
index 950b272644..5d769c41d1 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -111,7 +111,7 @@ MAIN DISTRIBUTION SBAZ
<binset dir="${basedir}/test"
includes="clitest,diff/diff.*,diff/lib*.dll,partest,partest.bat"/>
<miscset dir="${basedir}/test"
- includes="files/**/*.args,files/**/*.check,files/**/*.jar,files/**/*.java,files/**/*.scala,files/**/*.flags,files/cli/**/*.check.*,files/jvm/*.so,files/shootout/*.javaopts,files/shootout/*.runner,files/shootout/*.txt"/>
+ includes="files/**/*.args,files/**/*.check,files/**/*.dll,files/**/*.jar,files/**/*.java,files/**/*.scala,files/**/*.flags,files/cli/**/*.check.*,files/jvm/*.so,files/shootout/*.javaopts,files/shootout/*.runner,files/shootout/*.txt"/>
<!-- <srcset dir="${dist.dir}/src" includes="scala-partest-src.jar"/> -->
<libset dir="${dist.dir}/lib" includes="scala-partest.jar"/>
</sbaz>
diff --git a/src/compiler/scala/tools/nsc/doc/script.js b/src/compiler/scala/tools/nsc/doc/script.js
index 57796739f1..250f10963a 100644
--- a/src/compiler/scala/tools/nsc/doc/script.js
+++ b/src/compiler/scala/tools/nsc/doc/script.js
@@ -40,7 +40,7 @@ function get_api_root(key) {
return root;
}
-var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_2_RC5/';
+var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_2_RC6/';
var lib_src_root = scala_src_root + 'src/library/';
var comp_src_root = scala_src_root + 'src/compiler/';
var actors_src_root = scala_src_root + 'src/actors/';
diff --git a/test/files/jvm/natives-32.dll b/test/files/jvm/natives-32.dll
index 5671147982..a06c1da3e3 100755
--- a/test/files/jvm/natives-32.dll
+++ b/test/files/jvm/natives-32.dll
Binary files differ