Merge pull request #333 from jsuereth/release-fixes-from-2.9.x

Release fixes from 2.9.x

3 files changed, 21 insertions, 12 deletions

diff --git a/build.xml b/build.xml
index 2f655c2077..fcf4f90883 100644
--- a/build.xml
+++ b/build.xml
@@ -1671,7 +1671,7 @@ DOCUMENTATION
     <taskdef name="genman"
              classname="scala.tools.docutil.ManMaker"
              classpathref="manual.classpath"/>
-    <genman command="fsc, sbaz, scala, scalac, scaladoc, scalap"
+    <genman command="fsc, scala, scalac, scaladoc, scalap"
             htmlout="${build-docs.dir}/manual/html"
             manout="${build-docs.dir}/manual/genman"/>
     <!-- On Windows source and target files can't be the same ! -->
diff --git a/docs/README b/docs/README
index bcc7108399..6af633444d 100644
--- a/docs/README
+++ b/docs/README
@@ -2,8 +2,7 @@
 Scala Software Distributions
 ----------------------------
 
-- scala-<major>.<minor>.<patch>.tar.bz2     Unix distribution
-- scala-<major>.<minor>.<patch>.tar.gz      Unix distribution
+- scala-<major>.<minor>.<patch>.tgz         Unix distribution
 - scala-<major>.<minor>.<patch>.zip         Windows distribution
 
 The standard distributions require Java 1.5 or above. If you don't
@@ -32,15 +31,10 @@ directly accessible.
 
 You may test the distribution by running the following commands:
 
-$ ./bin/sbaz install scala-devel-docs
-$ ./bin/scalac doc/scala-devel-docs/examples/sort.scala
-$ ./bin/scala examples.sort
-[6,2,8,5,1]
-[1,2,5,6,8]
 $ ./bin/scala
-scala> examples.sort.main(null)
-[6,2,8,5,1]
-[1,2,5,6,8]
+scala> Array(4,3,2,1).sorted
+res0: Array[Int] = Array(1, 2, 3, 4)
+
 scala>:quit
 $
 
diff --git a/src/build/pack.xml b/src/build/pack.xml
index c12cfa44bf..723fd1d25d 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -78,6 +78,7 @@ MAIN DISTRIBUTION PACKAGING
         <exclude name="logs/**"/>
         <exclude name="sandbox/**"/>
         <exclude name="test/partest"/>
+        <exclude name=".git"/>
       </tarfileset>
       <tarfileset dir="${basedir}" prefix="${dist.name}-sources" filemode="755">
         <include name="test/partest"/>
@@ -95,8 +96,22 @@ MAIN DISTRIBUTION PACKAGING
       </fileset>
     </checksum>
   </target>
+
+  <target name="pack-archives.latest.unix" depends="pack-archives.src" unless="os.win">
+    <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
+             resource="${dists.dir}/archives/scala-${version.number}-sources.tgz"
+             overwrite="yes"/>
+  </target>
+
+  <target name="pack-archives.latest.win" depends="pack-archives.src" if="os.win">
+    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz">
+      <fileset dir="${dists.dir}/archives">
+         <include name="scala-${version.number}-sources.tgz"/>
+      </fileset>
+    </copy>
+  </target>
   
-  <target name="pack-archives.done" depends="pack-archives.src"/>
+  <target name="pack-archives.done" depends="pack-archives.src, pack-archives.latest.win, pack-archives.latest.unix"/>
   
 <!-- ===========================================================================
 MAIN DISTRIBUTION SBAZ