- support optimised build with "build.optimise"...

- support optimised build with "build.optimise", "dist.optimise" or
- "test.optimise". nightly builds are now optimised (but not the
- check-in builds) new starr containing all the latest optimiser-fixes

1 files changed, 62 insertions, 356 deletions

diff --git a/build.xml b/build.xml
index 14c247a197..d3f609337f 100644
--- a/build.xml
+++ b/build.xml
@@ -12,15 +12,20 @@ END-USER TARGETS
   
   <target name="build" depends="pack.done"
     description="Builds the Scala compiler and library. Executables are in 'build/pack/bin'."/>
+  <target name="build.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="build"/>
+  </target>
   
   <target name="clean" depends="quick.clean"
     description="Removes binaries of compiler and library. Distributions are untouched."/>
-  
+
   <target name="test" depends="test.done"
     description="Runs test suite and bootstrapping test on Scala compiler and library."/>
-  
-  <target name="optimised.test" depends="optimised.test.done"
-    description="Runs test suite and bootstrapping test on the optimised Scala compiler and library."/>
+  <target name="test.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="test"/>
+  </target>
 
   <target name="docs" depends="docs.done"
     description="Builds documentation for the Scala library. Scaladoc is in 'build/scaladoc/library'."/>
@@ -37,10 +42,18 @@ END-USER TARGETS
     <antcall target="docs.clean"/>
     <antcall target="all.done"/>
   </target>
+  <target name="dist.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="dist"/>
+  </target>
   
   <target name="fastdist" depends="dist.done"
     description="Makes a new distribution without testing it or removing partially build elements"/>
-  
+  <target name="fastdist.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="fastdist"/>
+  </target>
+
   <target name="distclean" depends="dist.clean"
     description="Removes all distributions. Binaries and documentation are untouched."/>
   
@@ -57,6 +70,10 @@ END-USER TARGETS
     <antcall target="locker.clean"/>
     <antcall target="test.done"/>
   </target>
+  <target name="newstarr.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="newstarr"/>
+  </target>
 
   <!-- Ant on Windows is not able to delete jar files that are referenced in any <path>.
        See ticket 1290 on trac. -->
@@ -78,32 +95,31 @@ END-USER TARGETS
     <antcall target="palo.clean"/>
     <antcall target="palo.done"/>
   </target>
-  
+  <target name="freshlocker.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="freshlocker"/>
+  </target>
+
   <target name="newlocker"
     description="Unlocks the Locker compiler and library and lets them be updated by Scalac.">
     <antcall target="locker.unlock"/>
     <antcall target="palo.done"/>
   </target>
+  <target name="newlocker.optimise">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="newlocker"/>
+  </target>
 
   <target name="newlibs"
           description="Forces compiler libraries (MSIL) to be rebuilt. Add this target before any other if class file format is incompatible.">
     <property name="libs.msil.outdated" value="yes"/>
   </target>
 
-  <target name="optimised"
-          description="Build the compiler and standard library using optimisations, running 'quick'">
-    <antcall target="optimised.bin"/>
-  </target>
-  
 <!-- ===========================================================================
 PROPERTIES
 ============================================================================ -->
 
   <property environment="env"/>
-  <!-- if ANT_OPTS is already set by the environment, it will be unaltered,
-       but if it is unset it will take this default value. -->
-  <property name="env.ANT_OPTS" value="-Xms512M -Xmx1024M -Xss1M -XX:MaxPermSize=128M" />
-
   <!-- Prevents system classpath from being used -->
   <property name="build.sysclasspath" value="ignore"/>
 
@@ -119,6 +135,8 @@ PROPERTIES
 
   <!-- Additional command line arguments for scalac. They are added to all build targets -->
   <property name="scalac.args" value=""/>
+  <property name="scalac.args.optimise" value=""/>
+  <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/>
   <property name="javac.args" value=""/>
 
   <!-- Sets location of pre-compiled libraries -->
@@ -132,7 +150,6 @@ PROPERTIES
   <property name="build-locker.dir" value="${build.dir}/locker"/>
   <property name="build-palo.dir" value="${build.dir}/palo"/>
   <property name="build-quick.dir" value="${build.dir}/quick"/>
-  <property name="build-optimised.dir" value="${build.dir}/optimised"/>
   <property name="build-pack.dir" value="${build.dir}/pack"/>
   <property name="build-strap.dir" value="${build.dir}/strap"/>
   <property name="build-docs.dir" value="${build.dir}/scaladoc"/>
@@ -147,6 +164,10 @@ PROPERTIES
        into the script runners created with scala.tools.ant.ScalaTool -->
   <property name="java.flags" value="-Xmx256M -Xms32M"/>
 
+  <!-- if ANT_OPTS is already set by the environment, it will be unaltered,
+       but if it is unset it will take this default value. -->
+  <property name="env.ANT_OPTS" value="-Xms512M -Xmx1024M -Xss1M -XX:MaxPermSize=128M" />
+
   <property
       name="scalacfork.jvmargs"
       value="${env.ANT_OPTS}"/>
@@ -232,7 +253,7 @@ LOCAL REFERENCE BUILD (LOCKER)
       destdir="${build-locker.dir}/classes/library"
       compilerpathref="starr.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/library"
       jvmargs="${scalacfork.jvmargs}">
       <include name="scala/Predef.scala"/>
@@ -244,7 +265,7 @@ LOCAL REFERENCE BUILD (LOCKER)
       destdir="${build-locker.dir}/classes/library"
       compilerpathref="starr.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/library"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -282,7 +303,7 @@ LOCAL REFERENCE BUILD (LOCKER)
       destdir="${build-locker.dir}/classes/compiler"
       compilerpathref="starr.classpath"
       srcpath="${src.dir}/compiler"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/compiler"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -413,7 +434,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/library"
       jvmargs="${scalacfork.jvmargs}">
       <include name="scala/Predef.scala"/>
@@ -425,7 +446,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/library"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -438,7 +459,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/actors"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -450,7 +471,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/dbc"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -462,7 +483,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/library"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/swing"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -510,7 +531,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/compiler"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/compiler"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/compiler"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -552,7 +573,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/scalap"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/scalap"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/scalap"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -594,7 +615,7 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/partest"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/partest"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/partest"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -872,7 +893,7 @@ BOOTSTRAPPING BUILD (STRAP)
       classpath="${build-strap.dir}/classes/library"
       sourcepath="${src.dir}/library"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="scala/Predef.scala"/>
     </scalac>
     <scalac
@@ -880,7 +901,7 @@ BOOTSTRAPPING BUILD (STRAP)
       destdir="${build-strap.dir}/classes/library"
       classpath="${build-strap.dir}/classes/library"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
       <exclude name="scala/Predef.scala"/>
     </scalac>
@@ -889,7 +910,7 @@ BOOTSTRAPPING BUILD (STRAP)
       destdir="${build-strap.dir}/classes/library"
       classpath="${build-strap.dir}/classes/library"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
     </scalac>
     <scalac
@@ -897,7 +918,7 @@ BOOTSTRAPPING BUILD (STRAP)
       destdir="${build-strap.dir}/classes/library"
       classpath="${build-strap.dir}/classes/library"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
     </scalac>
     <scalac
@@ -905,7 +926,7 @@ BOOTSTRAPPING BUILD (STRAP)
       destdir="${build-strap.dir}/classes/library"
       classpath="${build-strap.dir}/classes/library"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
     </scalac>
     <propertyfile file="${build-strap.dir}/classes/library/library.properties">
@@ -937,7 +958,7 @@ BOOTSTRAPPING BUILD (STRAP)
       srcdir="${src.dir}/compiler"
       destdir="${build-strap.dir}/classes/compiler"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
       <classpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
@@ -990,7 +1011,7 @@ BOOTSTRAPPING BUILD (STRAP)
       srcdir="${src.dir}/partest"
       destdir="${build-strap.dir}/classes/partest"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
       <classpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
@@ -1022,7 +1043,7 @@ BOOTSTRAPPING BUILD (STRAP)
       srcdir="${src.dir}/scalap"
       destdir="${build-strap.dir}/classes/scalap"
       target="jvm-1.5"
-      addparams="${scalac.args}">
+      addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
       <classpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
@@ -1043,301 +1064,6 @@ BOOTSTRAPPING BUILD (STRAP)
   </target>
 
 <!-- ===========================================================================
-OPTIMISED COMPILER
-============================================================================ -->
-
-  <target name="optimised.start" depends="quick.done"/>
-  
-  <target name="optimised.pre-lib" depends="optimised.start">
-    <uptodate property="optimised.lib.available" targetfile="${build-optimised.dir}/library.complete">
-      <srcfiles dir="${src.dir}">
-        <include name="library/**"/>
-        <include name="dbc/**"/>
-        <include name="actors/**"/>
-        <include name="swing/**"/>
-      </srcfiles>
-    </uptodate>
-  </target>
-
-  <target name="optimised.lib" depends="optimised.pre-lib" unless="optimised.lib.available">
-    <stopwatch name="optimised.lib.timer"/>
-    <mkdir dir="${build-optimised.dir}/classes/library"/>
-    <javac
-      srcdir="${src.dir}/library"
-      destdir="${build-optimised.dir}/classes/library"
-      classpath="${build-optimised.dir}/classes/library"
-      includes="**/*.java"
-      target="1.5" source="1.5">
-      <compilerarg line="${javac.args}"/> 
-    </javac>
-    <javac
-      srcdir="${src.dir}/actors"
-      destdir="${build-optimised.dir}/classes/library"
-      classpath="${build-optimised.dir}/classes/library"
-      includes="**/*.java"
-      target="1.5" source="1.5">
-      <compilerarg line="${javac.args}"/>
-    </javac>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/library"
-      compilerpathref="quick.classpath"
-      srcpath="${src.dir}/library"
-      params="-optimise ${scalac.args}"
-      srcdir="${src.dir}/library"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="scala/Predef.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-      </compilationpath>
-    </scalacfork>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/library"
-      compilerpathref="quick.classpath"
-      srcpath="${src.dir}/library"
-      params="-optimise ${scalac.args}"
-      srcdir="${src.dir}/library"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <exclude name="scala/Predef.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-      </compilationpath>
-    </scalacfork>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/library"
-      compilerpathref="quick.classpath"
-      srcpath="${src.dir}/library"
-      params="-optimise ${scalac.args}"
-      srcdir="${src.dir}/actors"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-      </compilationpath>
-    </scalacfork>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/library"
-      compilerpathref="quick.classpath"
-      srcpath="${src.dir}/library"
-      params="-optimise ${scalac.args}"
-      srcdir="${src.dir}/dbc"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-      </compilationpath>
-    </scalacfork>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/library"
-      compilerpathref="quick.classpath"
-      srcpath="${src.dir}/library"
-      params="-optimise ${scalac.args}"
-      srcdir="${src.dir}/swing"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-      </compilationpath>
-    </scalacfork>
-    <propertyfile file="${build-optimised.dir}/classes/library/library.properties">
-      <entry key="version.number" value="${version.number}"/>
-      <entry key="copyright.string" value="${copyright.string}"/>
-    </propertyfile>
-    <copy todir="${build-optimised.dir}/classes/library">
-      <fileset dir="${src.dir}/library">
-        <include name="**/*.tmpl"/>
-        <include name="**/*.xml"/>
-        <include name="**/*.js"/>
-        <include name="**/*.css"/>
-      </fileset>
-    </copy>
-    <touch file="${build-optimised.dir}/library.complete" verbose="no"/>
-    <stopwatch name="optimised.lib.timer" action="total"/>
-  </target>
-  
-  <target name="optimised.pre-comp" depends="optimised.lib">
-    <uptodate property="optimised.comp.available" targetfile="${build-opimised.dir}/compiler.complete">
-      <srcfiles dir="${src.dir}/compiler"/>
-    </uptodate>
-  </target>
-
-  <target name="optimised.comp" depends="optimised.pre-comp" unless="optimised.comp.available">
-    <stopwatch name="optimised.comp.timer"/>
-    <mkdir dir="${build-optimised.dir}/classes/compiler"/>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/compiler"
-      compilerpathref="quick.classpath"
-      srcpath="${src.dir}/compiler"
-      params="-optimise ${scalac.args}"
-      srcdir="${src.dir}/compiler"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-        <pathelement location="${build-optimised.dir}/classes/compiler"/>
-        <pathelement location="${fjbg.jar}"/>
-        <pathelement location="${msil.jar}"/>
-        <pathelement location="${jline.jar}"/>
-        <pathelement location="${ant.jar}"/>
-      </compilationpath>
-    </scalacfork>
-    <propertyfile file="${build-optimised.dir}/classes/compiler/compiler.properties">
-      <entry key="version.number" value="${version.number}"/>
-      <entry key="copyright.string" value="${copyright.string}"/>
-    </propertyfile>
-    <copy todir="${build-optimised.dir}/classes/compiler">
-      <fileset dir="${src.dir}/compiler">
-        <include name="**/*.tmpl"/>
-        <include name="**/*.xml"/>
-        <include name="**/*.js"/>
-        <include name="**/*.css"/>
-      </fileset>
-    </copy>
-    <touch file="${build-optimised.dir}/compiler.complete" verbose="no"/>
-    <stopwatch name="optimised.comp.timer" action="total"/>
-  </target>
-
-  <target name="optimised.pre-partest" depends="optimised.scalap">
-    <uptodate property="optimised.partest.available" targetfile="${build-optimised.dir}/partest.complete">
-      <srcfiles dir="${src.dir}/partest"/>
-    </uptodate>
-  </target>
-
-  <target name="optimised.partest" depends="optimised.pre-partest" unless="optimised.partest.available">
-    <stopwatch name="optimised.partest.timer"/>
-    <mkdir dir="${build-optimised.dir}/classes/partest"/>
-    <javac
-      srcdir="${src.dir}/partest"
-      destdir="${build-optimised.dir}/classes/partest"
-      target="1.5" source="1.5">
-      <classpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-        <pathelement location="${build-optimised.dir}/classes/compiler"/>
-        <pathelement location="${build-optimised.dir}/classes/scalap"/>
-        <pathelement location="${build-optimised.dir}/classes/partest"/>
-      </classpath>
-      <include name="**/*.java"/>
-      <compilerarg line="${javac.args}"/>
-    </javac>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/partest"
-      compilerpathref="locker.classpath"
-      srcpath="${src.dir}/partest"
-      params="${scalac.args}"
-      srcdir="${src.dir}/partest"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-        <pathelement location="${build-optimised.dir}/classes/compiler"/>
-        <pathelement location="${build-optimised.dir}/classes/scalap"/>
-        <pathelement location="${build-optimised.dir}/classes/partest"/>
-        <pathelement location="${ant.jar}"/>
-      </compilationpath>
-    </scalacfork>
-    <copy todir="${build-optimised.dir}/classes/partest">
-      <fileset dir="${src.dir}/partest">
-        <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-    <touch file="${build-optimised.dir}/partest.complete" verbose="no"/>
-    <stopwatch name="optimised.partest.timer" action="total"/>
-  </target>
-
-  <target name="optimised.pre-scalap" depends="optimised.comp">
-    <uptodate property="optimised.scalap.available" targetfile="${build-optimised.dir}/scalap.complete">
-      <srcfiles dir="${src.dir}/scalap"/>
-    </uptodate>
-  </target>
-
-  <target name="optimised.scalap" depends="optimised.pre-scalap" unless="optimised.scalap.available">
-    <stopwatch name="optimised.scalap.timer"/>
-    <mkdir dir="${build-optimised.dir}/classes/scalap"/>
-    <scalacfork
-      destdir="${build-optimised.dir}/classes/scalap"
-      compilerpathref="locker.classpath"
-      srcpath="${src.dir}/scalap"
-      params="${scalac.args}"
-      srcdir="${src.dir}/scalap"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-optimised.dir}/classes/library"/>
-        <pathelement location="${build-optimised.dir}/classes/compiler"/>
-        <pathelement location="${build-optimised.dir}/classes/partest"/>
-        <pathelement location="${build-optimised.dir}/classes/scalap"/>
-        <pathelement location="${ant.jar}"/>
-      </compilationpath>
-    </scalacfork>
-    <touch file="${build-optimised.dir}/scalap.complete" verbose="no"/>
-    <stopwatch name="optimised.scalap.timer" action="total"/>
-  </target>
-
-  <target name="optimised.pre-bin" depends="optimised.partest">
-    <condition property="optimised.bin.available">
-      <isset property="optimised.comp.available"/>
-    </condition>
-  </target>
-
-  <target name="optimised.bin" depends="optimised.pre-bin" unless="optimised.bin.available">
-    <path id="optimised.bin.classpath">
-      <pathelement location="${build-optimised.dir}/classes/library"/>
-      <pathelement location="${build-optimised.dir}/classes/compiler"/>
-      <pathelement location="${build-optimised.dir}/classes/scalap"/>
-      <pathelement location="${fjbg.jar}"/>
-      <pathelement location="${jline.jar}"/>
-    </path>
-    <taskdef name="optimised-bin" classname="scala.tools.ant.ScalaTool" classpathref="optimised.bin.classpath"/>
-    <mkdir dir="${build-optimised.dir}/bin"/>
-    <optimised-bin
-      file="${build-optimised.dir}/bin/scala"
-      class="scala.tools.nsc.MainGenericRunner"
-      javaFlags="${java.flags}"
-      classpathref="optimised.bin.classpath"/>
-    <optimised-bin
-      file="${build-optimised.dir}/bin/scalac"
-      class="scala.tools.nsc.Main"
-      javaFlags="${java.flags}"
-      classpathref="optimised.bin.classpath"/>
-    <optimised-bin
-      file="${build-optimised.dir}/bin/scaladoc"
-      class="scala.tools.nsc.ScalaDoc"
-      javaFlags="${java.flags}"
-      classpathref="optimised.bin.classpath"/>
-    <optimised-bin
-      file="${build-optimised.dir}/bin/fsc"
-      class="scala.tools.nsc.CompileClient"
-      javaFlags="${java.flags}"
-      classpathref="optimised.bin.classpath"/>
-    <optimised-bin
-      file="${build-optimised.dir}/bin/scalap"
-      class="scala.tools.scalap.Main"
-      javaFlags="${java.flags}"
-      classpathref="optimised.bin.classpath"/>
-    <chmod perm="ugo+rx" file="${build-optimised.dir}/bin/scala"/>
-    <chmod perm="ugo+rx" file="${build-optimised.dir}/bin/scalac"/>
-    <chmod perm="ugo+rx" file="${build-optimised.dir}/bin/scaladoc"/>
-    <chmod perm="ugo+rx" file="${build-optimised.dir}/bin/fsc"/>
-    <chmod perm="ugo+rx" file="${build-optimised.dir}/bin/scalap"/>
-    <touch file="${build-optimised.dir}/bin.complete" verbose="no"/>
-  </target>
-
-  <target name="optimised.done" depends="optimised.bin">
-    <path id="optimised.classpath">
-      <pathelement location="${build-optimised.dir}/classes/library"/>
-      <pathelement location="${build-optimised.dir}/classes/compiler"/>
-      <pathelement location="${build-optimised.dir}/classes/partest"/>
-      <pathelement location="${build-optimised.dir}/classes/scalap"/>
-      <pathelement location="${fjbg.jar}"/>
-      <pathelement location="${ant.jar}"/>
-    </path>
-  </target>
-
-  <target name="optimised.clean">
-    <delete dir="${build-optimised.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
-  </target>
-
-<!-- ===========================================================================
 LIBRARIES (MSIL, FJBG maybe later)
 ============================================================================ -->
   
@@ -1367,7 +1093,7 @@ LIBRARIES (MSIL, FJBG maybe later)
       destdir="${build-libs.dir}/classes/msil"
       compilerpathref="locker.classpath"
       srcpath="${src.dir}/msil"
-      params="${scalac.args}"
+      params="${scalac.args.all}"
       srcdir="${src.dir}/msil"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
@@ -1455,7 +1181,7 @@ DOCUMENTATION
       classpathref="pack.classpath"
       srcdir="${src.dir}/manual"
       includes="**/*.scala"
-      addparams="${scalac.args}"/>
+      addparams="${scalac.args.all}"/>
     <path id="manual.classpath">
       <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
       <pathelement location="${build.dir}/manmaker/classes"/>
@@ -1563,28 +1289,6 @@ BOOTRAPING TEST AND TEST SUITE
   
   <target name="test.done" depends="test.suite, test.stability"/>
 
-  <target name="optimised.test.suite" depends="optimised.done">
-    <taskdef resource="scala/tools/partest/antlib.xml" classpathref="optimised.classpath"/>
-    <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
-             timeout="1200000" javaccmd="${javac.cmd}">
-      <classpath>
-        <path refid="optimised.classpath"/>
-        <fileset dir="${test.dir}/files/lib" includes="*.jar"/>
-      </classpath>
-      <postests  dir="${test.dir}/files/pos" includes="*.scala"/>
-      <negtests  dir="${test.dir}/files/neg" includes="*.scala"/>
-      <runtests  dir="${test.dir}/files">
-        <include name="run/**/*.scala"/>
-      </runtests>
-      <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/>
-      <residenttests dir="${test.dir}/files/res" includes="*.res"/>
-      <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> -->
-    </partest>
-  </target>
-
-
-  <target name="optimised.test.done" depends="optimised.test.suite"/>
-
 <!-- ===========================================================================
 DISTRIBUTION
 ============================================================================ -->
@@ -1684,7 +1388,7 @@ TEST AND DISTRIBUTION BUNDLE (ALL)
 
   <target name="all.done" depends="dist.done, test.done"/>
 
-  <target name="all.clean" depends="locker.clean, docs.clean, dist.clean, optimised.clean"/>
+  <target name="all.clean" depends="locker.clean, docs.clean, dist.clean"/>
 
 <!-- ===========================================================================
 STABLE REFERENCE (STARR)
@@ -1777,7 +1481,9 @@ FORWARDED TARGETS FOR PACKAGING
 FORWARDED TARGETS FOR NIGHTLY BUILDS
 ============================================================================ -->
 
-  <target name="nightly" depends="all.done">
+  <target name="nightly">
+    <property name="scalac.args.optimise" value="-optimise"/>
+    <antcall target="all.done"/>
     <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/>
   </target>