Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Undid r17875 (#1660) in 2.7.x branch, updated v...

Undid r17875 (#1660) in 2.7.x branch, updated version numbers to 2.7.5.
  • Loading branch information...
commit add896978179ffe2b6109c213cdfeb61415c3e5a 1 parent 84aabc8
Antonio Cunei authored
2  META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
2 2 Bundle-ManifestVersion: 2
3 3 Bundle-Name: Scala Distribution
4 4 Bundle-SymbolicName: scala.tools.nsc;singleton:=true
5   -Bundle-Version: 2.7.4.final
  5 +Bundle-Version: 2.7.5.final
6 6 Eclipse-LazyStart: true
7 7 Bundle-ClassPath:
8 8 .,
2  build.number
... ... @@ -1,5 +1,5 @@
1 1 #Tue Sep 11 19:21:09 CEST 2007
2 2 version.minor=7
3   -version.patch=4
  3 +version.patch=5
4 4 version.suffix=final
5 5 version.major=2
3  build.xml
@@ -627,8 +627,8 @@ PACKED QUICK BUILD (PACK)
627 627 <!-- filemode / dirmode: see trac ticket #1294 -->
628 628 <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
629 629 <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
  630 + <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>
630 631 </jar>
631   - <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
632 632 </target>
633 633
634 634 <target name="pack.pre-partest" depends="pack.comp">
@@ -657,7 +657,6 @@ PACKED QUICK BUILD (PACK)
657 657 <classpath>
658 658 <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
659 659 <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
660   - <pathelement location="${build-pack.dir}/lib/jline.jar"/>
661 660 </classpath>
662 661 </taskdef>
663 662 <mkdir dir="${build-pack.dir}/bin"/>
2  src/build/pack.xml
@@ -97,7 +97,7 @@ MAIN DISTRIBUTION SBAZ
97 97 <binset
98 98 dir="${dist.dir}/bin"
99 99 includes="scala,scala.bat,scalac,scalac.bat,scaladoc,scaladoc.bat,fsc,fsc.bat"/>
100   - <libset dir="${dist.dir}/lib" includes="scala-compiler.jar,jline.jar"/>
  100 + <libset dir="${dist.dir}/lib" includes="scala-compiler.jar"/>
101 101 <manset dir="${dist.dir}/man" includes="**"/>
102 102 <srcset dir="${dist.dir}/src" includes="scala-compiler-src.jar"/>
103 103 </sbaz>
2  src/compiler/scala/tools/nsc/doc/script.js
@@ -40,7 +40,7 @@ function get_api_root(key) {
40 40 return root;
41 41 }
42 42
43   -var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_4_final/';
  43 +var scala_src_root = 'http://lampsvn.epfl.ch/trac/scala/browser/scala/tags/R_2_7_5_final/';
44 44 var lib_src_root = scala_src_root + 'src/library/';
45 45 var comp_src_root = scala_src_root + 'src/compiler/';
46 46 var actors_src_root = scala_src_root + 'src/actors/';

0 comments on commit add8969

Please sign in to comment.
Something went wrong with that request. Please try again.