summaryrefslogtreecommitdiff
blob: f542a80c2d07f4dc55c0345c6c5023f278d4093b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
--- build.xml.orig	2007-03-21 17:53:06.000000000 +0100
+++ build.xml	2007-05-04 13:53:33.000000000 +0200
@@ -86,11 +86,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>
+	-->
   <!-- Making sure enough memory is available -->
     <propertyregex
       property="memory.set" input="${env.ANT_OPTS}" select="\1"
@@ -784,7 +786,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
@@ -802,7 +804,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
@@ -886,7 +888,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"
@@ -896,7 +898,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}"/>
@@ -1045,7 +1047,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">
@@ -1066,7 +1068,7 @@
   </target>
 
   <!-- Create the SBaz packages -->
-  <target name="build.sbaz" depends="build.dist">
+  <target name="build.sbaz" depends="build.dist" if="do.archive">
     <property name="sbaz.universe" value="http://scala.epfl.ch/downloads/packages"/>
     <mkdir dir="${dist.dir}"/>
   <!-- Create the Scala library package -->
@@ -1120,7 +1122,7 @@
     </quicksbaz>
   </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">