From dc3fa0af9068c1bce78973bc089db639e8a44871 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Thu, 4 Apr 2013 19:06:45 -0700
Subject: if starr.use.released fetch Scala ${starr.version} for STARR

I recommend creating a build.properties file as follows:

```
locker.skip=1
starr.use.released=1
```

This will download the Scala version specified in starr.number,
use it to build quick, skipping locker.
---
 build.xml | 53 +++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index a3a22c53a0..3ec3a3f827 100644
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,14 @@
 SuperSabbus for Scala core, builds the scala library and compiler. It can also package it as a simple distribution, tests it for stable bootstrapping and against the Scala test suite.
   </description>
 
+<!-- HINTS
+
+ - for faster builds, have a build.properties in the same directory as build.xml that says:
+      locker.skip=1
+      starr.use.released=1
+
+-->
+
 <!-- USAGE FROM JENKINS SCRIPTS IS (CURRENTLY) AS FOLLOWS:
 ant $antArgs $scalacArgs $targets
 
@@ -16,14 +24,12 @@ scalacArgs examples:
   "-Dscalac.args=\"-Yrangepos\" -Dpartest.scalac_opts=\"-Yrangepos\""
 
 targets exercised:
-  build-opt nightly test.suite test.continuations.suite test.scaladoc locker.done
+  locker.done build-opt nightly test.suite test.continuations.suite test.scaladoc
 -->
 
 <!-- To use Zinc with the ant build:
   - install zinc and symlink the installed zinc script to ${basedir}/tools/zinc  (${basedir} is where build.xml and the rest of your checkout resides)
   - make sure to set ZINC_OPTS to match ANT_OPTS!
-  - invoke ant as `ant -Dstarr.version="2.10.1" -Dlocker.skip=1`
-    (zinc needs compiler jars)
 -->
 
 <!--
@@ -104,9 +110,13 @@ TODO:
 
   <!-- Loads custom properties definitions -->
   <property file="${basedir}/build.properties"/>
+
   <!-- Generating version number -->
   <property file="${basedir}/build.number"/>
 
+  <!-- read starr.version -->
+  <property file="${basedir}/starr.number"/>
+
   <!-- Sets location of pre-compiled libraries -->
   <property name="library.starr.jar"       value="${lib.dir}/scala-library.jar"/>
   <property name="reflect.starr.jar"       value="${lib.dir}/scala-reflect.jar"/>
@@ -219,15 +229,24 @@ TODO:
       <!-- BND support -->
       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
 
-      <!-- Download STARR via maven if `starr.version` is specified.
+      <!-- Download STARR via maven if `starr.use.released` is set,
+           and `starr.version` is specified (see the starr.number properties file).
            Want to slow down STARR changes, using only released versions. -->
-      <if><isset property="starr.version"/><then>
+      <if><isset property="starr.use.released"/><then>
+        <echo message="Using Scala ${starr.version} for STARR."/>
         <artifact:dependencies pathId="starr.core.path">
           <dependency groupId="org.scala-lang" artifactId="scala-library" version="${starr.version}"/>
           <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${starr.version}"/>
           <dependency groupId="org.scala-lang" artifactId="scala-compiler" version="${starr.version}"/>
-        </artifact:dependencies>
-      </then></if>
+        </artifact:dependencies></then>
+      <else>
+        <path id="starr.core.path">
+          <pathelement location="${library.starr.jar}"/>
+          <pathelement location="${reflect.starr.jar}"/>
+          <pathelement location="${compiler.starr.jar}"/>
+          <pathelement location="${msil.starr.jar}"/>
+        </path></else>
+      </if>
 
       <property name="maven-deps-done"     value="yep!"/>
     </then></if>
@@ -426,24 +445,10 @@ TODO:
       <path refid="aux.libs"/>
     </path>
 
-    <!-- Download STARR (see above) via maven if `starr.version` is specified.
-         Want to slow down STARR changes, using only released versions. -->
-    <if><isset property="starr.version"/><then>
-      <echo message="Using Scala ${starr.version} for STARR."/>
-      <!-- <echo message="STARR classpath: ${ant.refid:starr.compiler.path}"/> -->
-    </then><else>
-      <path id="starr.core.path">
-        <pathelement location="${library.starr.jar}"/>
-        <pathelement location="${reflect.starr.jar}"/>
-        <pathelement location="${compiler.starr.jar}"/>
-        <pathelement location="${msil.starr.jar}"/>
-      </path>
-    </else></if>
-
-    <!-- Skip locker with -Dlocker.skip=YESSIR. Uses STARR instead. -->
+    <!-- To skip locker, use -Dlocker.skip=1 -->
     <if><isset property="locker.skip"/><then>
-      <echo message="Skipping locker! Using STARR instead."/>
-      <path id="locker.compiler.path"><path refid="starr.compiler.path"/></path>
+      <echo message="Using STARR to build the quick stage (skipping locker)."/>
+      <path id="locker.compiler.path" refid="starr.compiler.path"/>
       <property name="locker.locked" value="locker skipped"/></then>
     <else>
       <path id="locker.compiler.path"><path refid="locker.compiler.build.path"/></path></else></if>
-- 
cgit v1.2.3