--- build.xml	2007-12-19 14:34:43.000000000 +0100
+++ build.xml	2008-01-20 18:00:33.000000000 +0100
@@ -108,11 +108,13 @@
   <!-- Setting-up Ant contrib tasks -->
     <taskdef resource="net/sf/antcontrib/antlib.xml"
              classpath="${ant-contrib.jar}"/>
+      <!--
     <fail message="External library ${ant-contrib.jar} requires the optional Ant tasks to be installed">
       <condition><not><and>
         <available file="${ant.home}/lib/ant-nodeps.jar"/>
       </and></not></condition>
     </fail>
+      -->
   </target>
 
 <!-- ===========================================================================
@@ -1410,7 +1412,7 @@
 DOCUMENTATION
 ============================================================================ -->
 
-  <target name="docs" depends="setup.quick"
+  <target name="docs" depends="setup.quick" if="do.docs"
     description="Generated the API for library sources">
     <mkdir dir="${api-lib.dir}"/>
     <quickdoc
@@ -1428,7 +1430,7 @@
     </quickdoc>
   </target>
 
-  <target name="docs.compiler" depends="setup.quick"
+  <target name="docs.compiler" depends="setup.quick" if="do.docs"
     description="Generated the API for compiler sources">
     <mkdir dir="${api-comp.dir}"/>
     <quickdoc
@@ -1513,7 +1515,7 @@
 
   <target name="dist.patch" depends="init">
     <propertyfile file="${number.file}">
-      <entry key="version.patch" type="int" default="0" operation="+"/>
+      <entry key="version.patch" type="int" default="0"/>
     </propertyfile>
     <property file="${number.file}"/>
     <property name="version.number"
@@ -1523,7 +1525,7 @@
 
   <target name="dist.minor" depends="init">
     <propertyfile file="${number.file}">
-      <entry key="version.minor" type="int" default="0" operation="+"/>
+      <entry key="version.minor" type="int" default="0"/>
       <entry key="version.patch" type="int" value="0"/>
     </propertyfile>
     <property file="${number.file}"/>
@@ -1729,7 +1731,7 @@
     <copy todir="${dist.current.dir}/doc/scala">
       <fileset dir="${docs.dir}" includes="README,LICENSE"/>
     </copy>
-    <copy todir="${dist.current.dir}/doc/scala/api">
+    <copy todir="${dist.current.dir}/doc/scala/api" failonerror="false">
       <fileset dir="${api-lib.dir}"/>
     </copy>
     <copy todir="${dist.current.dir}/doc/scala/examples">
@@ -1750,7 +1752,7 @@
   </target>
 
   <!-- Create the SBaz packages -->
-  <target name="build.sbaz" depends="build.dist,msil,cldc,android">
+  <target name="build.sbaz" depends="build.dist" if="do.archive">
     <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/>
     <mkdir dir="${dist.dir}"/>
   <!-- Create the Scala library package -->
@@ -1846,7 +1848,7 @@
     </then></if>
   </target>
 
-  <target name="build.archive" depends="build.dist">
+  <target name="build.archive" depends="build.dist" if="do.archive">
     <tar
       destfile="${dist.dir}/scala-${version.number}.tgz"
       compression="gzip">