2.7.1 branch: merged latest supersabbus.

7 files changed, 245 insertions, 12 deletions

diff --git a/build.number b/build.number
index 02e69853f5..f57dffdaed 100644
--- a/build.number
+++ b/build.number
@@ -1,5 +1,5 @@
 #Tue Sep 11 19:21:09 CEST 2007
 version.minor=7
 version.patch=1
-version.suffix=RC2
+version.suffix=final
 version.major=2
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 18d771ce39..bdad142520 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-33c629ad0eed4fa13c6b12c7f905d8d9c328ef37 ?scala-compiler.jar
+90ce70b0ed4a69f829bd5c2492a31e3944856812 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index a6d4146f75..27ae9682c9 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-507191df35fda2d4f43f475ccb27cb8f67768dfa ?scala-library-src.jar
+d1882d48a6fa34a65ae2399ba46e9ffb6c3b1be7 ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 5cac367c99..480928674d 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-ae9968e8f6b00f6d5538a8b2d2f6e1f07931dd3d ?scala-library.jar
+77c3e7c1314f5e771abf93303002f5ebc1c95912 ?scala-library.jar
diff --git a/sabbus.xml b/sabbus.xml
index a4631ade3f..b8d37d0c40 100644
--- a/sabbus.xml
+++ b/sabbus.xml
@@ -46,12 +46,18 @@ END-USER TARGETS
     <antcall target="test.done"/>
   </target>
   
-  <target name="newlocker"
+  <target name="freshlocker"
     description="Replaces the Locker compiler and library by one built from current sources.">
     <antcall target="locker.clean"/>
     <antcall target="locker.done"/>
   </target>
   
+  <target name="newlocker"
+    description="Unlocks the Locker compiler and library and lets them be updated by Scalac.">
+    <antcall target="locker.unlock"/>
+    <antcall target="locker.done"/>
+  </target>
+  
 <!-- ===========================================================================
 PROPERTIES
 ============================================================================ -->
@@ -91,6 +97,7 @@ PROPERTIES
   
   <property name="copyright.string" value="Copyright 2002-2008, LAMP/EPFL"/>
   
+  <!-- These are NOT the flags used to run SuperSabbus -->
   <property name="java.flags" value="-Xmx256M -Xms32M"/>
 
 <!-- ===========================================================================
@@ -253,6 +260,11 @@ LOCAL REFERENCE BUILD (LOCKER)
   <target name="locker.clean" depends="quick.clean">
     <delete dir="${build-locker.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
   </target>
+  
+  <target name="locker.unlock" depends="quick.clean">
+    <delete file="${build-locker.dir}/library.complete"/>
+    <delete file="${build-locker.dir}/compiler.complete"/>
+  </target>
 
 <!-- ===========================================================================
 QUICK BUILD (QUICK)
@@ -511,6 +523,7 @@ PACKED QUICK BUILD (PACK)
       <fileset dir="${build-quick.dir}/classes/compiler"/>
       <zipfileset src="${fjbg.jar}"/>
       <zipfileset src="${msil.jar}"/>
+      <zipfileset src="${jline.jar}"/>
     </jar>
   </target>
   
@@ -830,7 +843,7 @@ BOOTRAPING TEST AND TEST SUITE
   </target>
 
   <target name="test.suite" depends="pack.done">
-    <partest showlog="yes" erroronfailed="yes">
+    <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java">
       <classpath>
         <path refid="pack.classpath"/>
         <fileset dir="${test.dir}/files/lib" includes="*.jar"/>
@@ -872,13 +885,27 @@ DISTRIBUTION
   </target>
     
   <target name="dist.doc" depends="dist.base">
-    <mkdir dir="${dist.dir}/doc/api"/>
-    <copy toDir="${dist.dir}/doc/api">
+    <mkdir dir="${dist.dir}/doc/scala"/>
+    <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc/scala"/>
+    <copy file="${docs.dir}/README" toDir="${dist.dir}/doc/scala"/>
+    <mkdir dir="${dist.dir}/doc/scala/api"/>
+    <copy toDir="${dist.dir}/doc/scala/api">
       <fileset dir="${build-docs.dir}/library"/>
     </copy>
+    <mkdir dir="${dist.dir}/doc/scala/examples"/>
+    <copy toDir="${dist.dir}/doc/scala/examples">
+      <fileset dir="${docs.dir}/examples"/>
+    </copy>
+  </target>
+    
+  <target name="dist.man" depends="dist.doc">
+    <mkdir dir="${dist.dir}/man"/>
+    <copy toDir="${dist.dir}/man">
+      <fileset dir="${docs.dir}/man"/>
+    </copy>
   </target>
     
-  <target name="dist.src" depends="dist.doc">
+  <target name="dist.src" depends="dist.man">
     <mkdir dir="${dist.dir}/src"/>
     <jar destfile="${dist.dir}/src/scala-library-src.jar">
       <fileset dir="${src.dir}/library"/>
@@ -953,7 +980,7 @@ FORWARDED TARGETS FOR JVM 1.4 BUILD
     <ant antfile="${src.dir}/build/four.xml" target="four-test.done" inheritall="yes" inheritrefs="yes"/>
   </target>
   
-  <target name="fourdist" depends="all.done">
+  <target name="fourdist" depends="pack.done">
     <ant antfile="${src.dir}/build/four.xml" target="four-all.done" inheritall="yes" inheritrefs="yes"/>
   </target>
   
@@ -962,6 +989,33 @@ FORWARDED TARGETS FOR JVM 1.4 BUILD
   </target>
 
 <!-- ===========================================================================
+FORWARDED TARGETS FOR PACKAGING
+============================================================================ -->
+  
+  <target name="distpack" depends="dist.done">
+    <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
+  
+  <target name="fourdistpack" depends="fourdist">
+    <ant antfile="${src.dir}/build/pack.xml" target="fourpack-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
+
+<!-- ===========================================================================
+FORWARDED TARGETS FOR NIGHTLY BUILDS
+============================================================================ -->
+  
+  <target name="nightly" depends="all.done">
+    <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
+  
+  <target name="fournightly" depends="pack.done">
+    <ant antfile="${src.dir}/build/four.xml" target="four-all.done" inheritall="yes" inheritrefs="yes"/>
+    <ant antfile="${src.dir}/build/pack.xml" target="fourpack-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
+  
+  <target name="msilnightly"/>
+
+<!-- ===========================================================================
 MISCELLANEOUS
 ============================================================================ -->
   
diff --git a/src/build/four.xml b/src/build/four.xml
index e250f8baaa..bc59288f07 100644
--- a/src/build/four.xml
+++ b/src/build/four.xml
@@ -29,7 +29,7 @@ JAVA 1.4 LIBRARY AND COMPILER BUILD (FOUR)
     <sync todir="${build-four-src.dir}">
       <fileset dir="${src.dir}/library"/>
     </sync>
-    <copy todir="${build-four-src.dir}">
+    <copy todir="${build-four-src.dir}" overwrite="true">
       <fileset dir="${src.dir}/jvm14-library"/>
     </copy>
   </target>
@@ -160,7 +160,7 @@ JAVA 1.4 LIBRARY AND COMPILER BUILD (FOUR)
     <stopwatch name="four.partest.timer" action="total"/>
   </target>
   
-  <target name="four.done" depends="four.partests"/>
+  <target name="four.done" depends="four.partest"/>
 
   <target name="four.clean" depends="four-pack.clean">
     <delete dir="${build-four.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
diff --git a/src/build/pack.xml b/src/build/pack.xml
new file mode 100644
index 0000000000..d8fb0f9441
--- /dev/null
+++ b/src/build/pack.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="sabbus-pack">
+
+  <description>
+    SuperSabbus extension for packaging a distribution to Sbaz or other distribution methods. THIS FILE IS NOT STAND-ALONE AND SHOULD ONLY BE USED THROUGH ENTRY POINTS IN SUPERSABBUS.
+  </description>
+  
+<!-- ===========================================================================
+PROPERTIES
+============================================================================ -->
+  
+  <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/>
+  
+<!-- ===========================================================================
+MAIN DISTRIBUTION PACKAGING
+============================================================================ -->
+  
+  <target name="pack-archives.start">
+    <mkdir dir="${dists.dir}/archives"/>
+  </target>
+  
+  <target name="pack-archives.tar" depends="pack-archives.start">
+    <tar destfile="${dists.dir}/archives/scala-${version.number}.tgz" compression="gzip">
+      <tarfileset dir="${dist.dir}" prefix="scala-${version.number}" includes="bin/**" mode="755"/>
+      <tarfileset dir="${dist.dir}" prefix="scala-${version.number}" excludes="bin/**"/>
+    </tar>
+    <checksum file="${dists.dir}/archives/scala-${version.number}.tgz" fileext=".md5"/>
+  </target>
+  
+  <target name="pack-archives.zip" depends="pack-archives.tar">
+    <zip destfile="${dists.dir}/archives/scala-${version.number}.zip">
+      <zipfileset prefix="scala-${version.number}" dir="${dist.dir}"/>
+    </zip>
+    <checksum file="${dists.dir}/archives/scala-${version.number}.zip" fileext=".md5"/>
+  </target>
+  
+  <target name="pack-archives.src" depends="pack-archives.zip">
+    <tar destfile="${dists.dir}/archives/scala-${version.number}-sources.tgz" compression="gzip">
+      <tarfileset dir="${basedir}">
+        <exclude name="build/**"/>
+        <exclude name="debian/**"/>
+        <exclude name="dists/**"/>
+        <exclude name="logs/**"/>
+        <exclude name="META-INF/**"/>
+        <exclude name="sandbox/**"/>
+      </tarfileset>
+    </tar>
+    <checksum file="${dists.dir}/archives/scala-${version.number}-sources.tgz" fileext=".md5"/>
+  </target>
+  
+  <target name="pack-archives.done" depends="pack-archives.src"/>
+  
+<!-- ===========================================================================
+MAIN DISTRIBUTION SBAZ
+============================================================================ -->
+  
+  <target name="pack-sbaz.start">
+    <mkdir dir="${dists.dir}/sbaz"/>
+  </target>
+  
+  <target name="pack-sbaz.lib" depends="pack-sbaz.start">
+    <sbaz
+      file="${dists.dir}/sbaz/scala-library-${version.number}.sbp"
+      adfile="${dists.dir}/sbaz/scala-library-${version.number}.advert"
+      name="scala-library"
+      version="${version.number}"
+      desc="The Scala library. This is the minimal requirement to run any Scala program."
+      link="${sbaz.universe}/scala-library-${version.number}.sbp">
+      <libset dir="${dist.dir}/lib" includes="scala-library.jar,scala-dbc.jar"/>
+      <srcset dir="${dist.dir}/src" includes="scala-library-src.jar,scala-dbc-src.jar"/>
+    </sbaz>
+  </target>
+  
+  <target name="pack-sbaz.comp" depends="pack-sbaz.lib">
+    <sbaz
+      file="${dists.dir}/sbaz/scala-devel-${version.number}.sbp"
+      adfile="${dists.dir}/sbaz/scala-devel-${version.number}.advert"
+      name="scala-devel"
+      version="${version.number}"
+      desc="The Scala developer tools. This contains everything that is required to write, test and document new Scala programs."
+      depends="scala-library"
+      link="${sbaz.universe}/scala-devel-${version.number}.sbp">
+      <binset dir="${dist.dir}/bin" includes="**"/>
+      <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>
+  </target>
+
+  <target name="pack-sbaz.test" depends="pack-sbaz.comp">
+    <sbaz
+      file="${dists.dir}/sbaz/scala-test-${version.number}.sbp"
+      adfile="${dists.dir}/sbaz/scala-test-${version.number}.advert"
+      name="scala-test"
+      version="${version.number}"
+      desc="The Scala test package contains everything needed to test Scala."
+      link="${sbaz.universe}/scala-test-${version.number}.sbp">
+      <binset dir="${basedir}/test"
+        includes="clitest,diff/diff.*,diff/lib*.dll,scalatest,scalatest.bat,partest"/>
+      <miscset dir="${basedir}/test"
+        includes="files/**/*.args,files/**/*.check,files/**/*.jar,files/**/*.java,files/**/*.scala,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>
+  </target>
+  
+  <target name="pack-sbaz.doc" depends="pack-sbaz.test">
+    <sbaz
+      file="${dists.dir}/sbaz/scala-devel-docs-${version.number}.sbp"
+      adfile="${dists.dir}/sbaz/scala-devel-docs-${version.number}.advert"
+      name="scala-devel-docs"
+      version="${version.number}"
+      desc="The Scala developer documentation. This contains all developer documentation."
+      link="${sbaz.universe}/scala-devel-docs-${version.number}.sbp">
+      <docset dir="${dist.dir}/doc"/>
+    </sbaz>
+  </target>
+  
+  <target name="pack-sbaz.all" depends="pack-sbaz.doc">
+    <sbaz
+      file="${dists.dir}/sbaz/scala-${version.number}.sbp"
+      adfile="${dists.dir}/sbaz/scala-${version.number}.advert"
+      name="scala"
+      version="${version.number}"
+      desc="The base Scala package that contains everything needed to start using Scala."
+      depends="scala-library,scala-devel"
+      link="${sbaz.universe}/scala-${version.number}.sbp"/>
+  </target>
+  
+  <target name="pack-sbaz.done" depends="pack-sbaz.all"/>
+  
+<!-- ===========================================================================
+JAVA FOUR DISTRIBUTION PACKAGING
+============================================================================ -->
+  
+  <target name="fourpack-archives.start">
+    <mkdir dir="${dists.dir}/archives"/>
+  </target>
+  
+  <target name="fourpack-archives.tar" depends="fourpack-archives.start">
+    <tar destfile="${dists.dir}/archives/scala-jvm4-${version.number}.tgz" compression="gzip">
+      <tarfileset dir="${four-dist.dir}" prefix="scala-jvm4-${version.number}" includes="bin/**" mode="755"/>
+      <tarfileset dir="${four-dist.dir}" prefix="scala-jvm4-${version.number}" excludes="bin/**"/>
+    </tar>
+    <checksum file="${dists.dir}/archives/scala-jvm4-${version.number}.tgz" fileext=".md5"/>
+  </target>
+  
+  <target name="fourpack-archives.zip" depends="fourpack-archives.tar">
+    <zip destfile="${dists.dir}/archives/scala-jvm4-${version.number}.zip">
+      <zipfileset prefix="scala-jvm4-${version.number}" dir="${dist.dir}"/>
+    </zip>
+    <checksum file="${dists.dir}/archives/scala-jvm4-${version.number}.zip" fileext=".md5"/>
+  </target>
+  
+  <target name="fourpack-archives.done" depends="fourpack-archives.zip"/>
+
+<!-- ===========================================================================
+MISCELLANEOUS
+============================================================================ -->
+  
+  <target name="pack-all.done" depends="pack-archives.done, pack-sbaz.done"/>
+  
+  <target name="fourpack-all.done" depends="fourpack-archives.done"/>
+
+<!-- ===========================================================================
+MISCELLANEOUS
+============================================================================ -->
+  
+  <target name="graph.init">
+    <echo message="${basedir}/lib/ant/vizant.jar"/>
+    <taskdef name="vizant" classname="vizant.Vizant" classpath="${basedir}/../../lib/ant/vizant.jar"/>
+  </target>
+  
+  <target name="graph.pack" depends="graph.init">
+    <vizant antfile="${ant.file}" outfile="${ant.project.name}.dot"/>
+  </target>
+  
+</project>