diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-31 18:30:21 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-31 18:30:21 +0000 |
| commit | add896978179ffe2b6109c213cdfeb61415c3e5a (patch) | |
| tree | 11561f13f1a5dafb8288e14707ca2f51f0613c70 | |
| parent | 84aabc85f18294803213e91c8c3ff8ae5f18ff5b (diff) | |
| download | scala-2.7.5.tar.gz scala-2.7.5.tar.bz2 scala-2.7.5.zip | |
Undid r17875 (#1660) in 2.7.x branch, updated v...v2.7.5
Undid r17875 (#1660) in 2.7.x branch, updated version numbers to 2.7.5.
| -rw-r--r-- | META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | build.number | 2 | ||||
| -rw-r--r-- | build.xml | 3 | ||||
| -rw-r--r-- | src/build/pack.xml | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/script.js | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index f22931be9e..c80ea9edb5 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.4.final +Bundle-Version: 2.7.5.final Eclipse-LazyStart: true Bundle-ClassPath: ., diff --git a/build.number b/build.number index e397b7326c..a6e53edfbc 100644 --- a/build.number +++ b/build.number @@ -1,5 +1,5 @@ #Tue Sep 11 19:21:09 CEST 2007 version.minor=7 -version.patch=4 +version.patch=5 version.suffix=final version.major=2 @@ -627,8 +627,8 @@ PACKED QUICK BUILD (PACK) <!-- filemode / dirmode: see trac ticket #1294 --> <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/> <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/> + <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/> </jar> - <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/> </target> <target name="pack.pre-partest" depends="pack.comp"> @@ -657,7 +657,6 @@ PACKED QUICK BUILD (PACK) <classpath> <pathelement location="${build-pack.dir}/lib/scala-library.jar"/> <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> - <pathelement location="${build-pack.dir}/lib/jline.jar"/> </classpath> </taskdef> <mkdir dir="${build-pack.dir}/bin"/> diff --git a/src/build/pack.xml b/src/build/pack.xml index b1aa9acc68..bed8d1e782 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -97,7 +97,7 @@ MAIN DISTRIBUTION SBAZ <binset dir="${dist.dir}/bin" includes="scala,scala.bat,scalac,scalac.bat,scaladoc,scaladoc.bat,fsc,fsc.bat"/> - <libset dir="${dist.dir}/lib" includes="scala-compiler.jar,jline.jar"/> + <libset dir="${dist.dir}/lib" includes="scala-compiler.jar"/> <manset dir="${dist.dir}/man" includes="**"/> <srcset dir="${dist.dir}/src" includes="scala-compiler-src.jar"/> </sbaz> diff --git a/src/compiler/scala/tools/nsc/doc/script.js b/src/compiler/scala/tools/nsc/doc/script.js index 76fb5dad7a..26e4f4ec3e 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_4_final/'; +var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_5_final/'; 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/'; |