From 5dca660a93086fca5aa59eda8bfa3a67e2d88fe1 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Wed, 27 Mar 2013 18:11:08 -0700
Subject: get rid of args element in staged-scalac

---
 build.xml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 5b776d1abd..1827a81d7a 100644
--- a/build.xml
+++ b/build.xml
@@ -775,32 +775,27 @@ targets exercised:
     <attribute name="args" default=""/>                  <!-- additional args -->
     <attribute name="destproject" default="@{project}"/> <!-- overrides the output directory; used when building multiple projects into the same directory-->
     <attribute name="srcdir" default="@{project}"/>
-    <element name="args" implicit="true" optional="true"/>
 
     <sequential>
       <if><equals arg1="@{srcpath}" arg2="NOT SET"/><then>
         <scalacfork taskname="@{stage}.@{project}"
-          destdir="${build-@{stage}.dir}/classes/@{destproject}"
+          jvmargs="${scalacfork.jvmargs}"
           compilerpathref="@{with}.compiler.path"
-          params="${scalac.args.@{stage}} @{args}"
+          destdir="${build-@{stage}.dir}/classes/@{destproject}"
           srcdir="${src.dir}/@{srcdir}"
-          jvmargs="${scalacfork.jvmargs}">
+          params="${scalac.args.@{stage}} @{args}">
           <include name="**/*.scala"/>
-          <compilationpath refid="@{stage}.@{project}.build.path"/>
-          <args/>
-        </scalacfork></then>
+          <compilationpath refid="@{stage}.@{project}.build.path"/></scalacfork></then>
       <else>
         <scalacfork taskname="@{stage}.@{project}"
-          destdir="${build-@{stage}.dir}/classes/@{destproject}"
+          jvmargs="${scalacfork.jvmargs}"
           compilerpathref="@{with}.compiler.path"
-          srcpath="@{srcpath}"
-          params="${scalac.args.@{stage}} @{args}"
+          destdir="${build-@{stage}.dir}/classes/@{destproject}"
           srcdir="${src.dir}/@{srcdir}"
-          jvmargs="${scalacfork.jvmargs}">
+          srcpath="@{srcpath}"
+          params="${scalac.args.@{stage}} @{args}">
           <include name="**/*.scala"/>
-          <compilationpath refid="@{stage}.@{project}.build.path"/>
-          <args/>
-        </scalacfork></else>
+          <compilationpath refid="@{stage}.@{project}.build.path"/></scalacfork></else>
       </if>
     </sequential>
   </macrodef>
@@ -1087,10 +1082,7 @@ targets exercised:
         <!-- have to compile with quick compiler here! -->
         <staged-scalac with="quick" stage="quick" project="plugins"
                        srcdir="continuations/library" destproject="continuations-library"
-                       args="-Xplugin-require:continuations -P:continuations:enable">
-          <compilerarg value="-Xpluginsdir"/>
-          <compilerarg file="${build-quick.dir}/misc/scala-devel/plugins"/>
-        </staged-scalac>
+                       args="-Xplugin-require:continuations -P:continuations:enable -Xpluginsdir ${build-quick.dir}/misc/scala-devel/plugins"/>
 
         <stopwatch name="quick.plugins.timer" action="total"/>
       </do>
-- 
cgit v1.2.3


From ceeb40cd89629f947e6e62988bb551157b601bf8 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 1 Apr 2013 23:51:11 -0700
Subject: Regularity for build.xml: 1 output dir / project

Untangle actors, msil builds from library/compiler builds.
For further regularity, always build java files.

TODO: update IDE projects
---
 build.xml | 179 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 89 insertions(+), 90 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 1827a81d7a..3d2f9f5faa 100644
--- a/build.xml
+++ b/build.xml
@@ -410,9 +410,8 @@ targets exercised:
     <!-- 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>
-      <property name="strr" refid="starr.compiler.path"/>
       <echo message="Using Scala ${starr.version} for STARR."/>
-      <!-- <echo message="STARR classpath: ${strr}"/> -->
+      <!-- <echo message="STARR classpath: ${ant.refid:starr.compiler.path}"/> -->
     </then><else>
       <path id="starr.core.path">
         <pathelement location="${library.starr.jar}"/>
@@ -449,6 +448,16 @@ targets exercised:
       <path refid="aux.libs"/>
     </path>
 
+    <path id="locker.actors.build.path">
+      <path refid="locker.library.build.path"/>
+      <pathelement location="${build-locker.dir}/classes/actors"/>
+    </path>
+
+    <path id="locker.msil.build.path">
+      <path refid="locker.compiler.build.path"/>
+      <pathelement location="${build-locker.dir}/classes/msil"/>
+    </path>
+
     <path id="locker.reflect.build.path">
       <path refid="locker.library.build.path"/>
       <pathelement location="${build-locker.dir}/classes/reflect"/>
@@ -457,6 +466,7 @@ targets exercised:
     <path id="locker.compiler.build.path">
       <path refid="locker.reflect.build.path"/>
       <pathelement location="${build-locker.dir}/classes/compiler"/>
+      <pathelement location="${build-locker.dir}/classes/msil"/>
       <path refid="asm.classpath"/>
       <path refid="fjbg.classpath"/>
       <pathelement location="${jline.jar}"/>
@@ -471,23 +481,35 @@ targets exercised:
       <path refid="aux.libs"/>
     </path>
 
-    <path id="quick.actors.build.path"><path refid="quick.library.build.path"/></path>
+    <path id="quick.actors.build.path">
+      <path refid="quick.library.build.path"/>
+      <pathelement location="${build-quick.dir}/classes/actors"/>
+    </path>
 
     <path id="quick.reflect.build.path">
       <path refid="quick.library.build.path"/>
       <pathelement location="${build-quick.dir}/classes/reflect"/>
     </path>
 
+    <path id="quick.msil.build.path">
+      <path refid="quick.compiler.build.path"/>
+      <pathelement location="${build-quick.dir}/classes/msil"/>
+    </path>
+
     <path id="quick.compiler.build.path">
       <path refid="quick.reflect.build.path"/>
       <pathelement location="${build-quick.dir}/classes/compiler"/>
+      <pathelement location="${build-quick.dir}/classes/msil"/>
       <path refid="asm.classpath"/>
       <path refid="fjbg.classpath"/>
       <pathelement location="${jline.jar}"/>
     </path>
 
-    <path id="quick.swing.build.path" refid="quick.library.build.path"/>
-    <path id="quick.msil.build.path" refid="quick.compiler.build.path"/>
+    <path id="quick.swing.build.path">
+      <path refid="quick.library.build.path"/>
+      <path refid="quick.actors.build.path"/>
+      <pathelement location="${build-quick.dir}/classes/swing"/>
+    </path>
 
     <path id="quick.plugins.build.path">
       <path refid="quick.compiler.build.path"/>
@@ -496,6 +518,7 @@ targets exercised:
 
     <path id="quick.scalacheck.build.path">
       <pathelement location="${build-quick.dir}/classes/library"/>
+      <pathelement location="${build-quick.dir}/classes/actors"/>
       <pathelement location="${build-quick.dir}/classes/scalacheck"/>
     </path>
 
@@ -513,8 +536,10 @@ targets exercised:
 
     <path id="quick.bin.tool.path">
       <pathelement location="${build-quick.dir}/classes/library"/>
+      <pathelement location="${build-quick.dir}/classes/actors"/>
       <pathelement location="${build-quick.dir}/classes/reflect"/>
       <pathelement location="${build-quick.dir}/classes/compiler"/>
+      <pathelement location="${build-quick.dir}/classes/msil"/>
       <pathelement location="${build-quick.dir}/classes/scalap"/>
       <pathelement location="${build-quick.dir}/classes/continuations-library"/>
       <pathelement location="${jline.jar}"/>
@@ -548,22 +573,18 @@ targets exercised:
     </path>
 
     <path id="pack.library.files">
-      <fileset dir="${build-quick.dir}/classes/library">
-        <!-- <exclude name="scala/swing/**"/> -->
-        <exclude name="scala/actors/**"/>
-      </fileset>
+      <fileset dir="${build-quick.dir}/classes/library"/>
       <fileset dir="${build-quick.dir}/classes/continuations-library"/>
       <fileset dir="${forkjoin-classes}"/>
     </path>
 
     <path id="pack.actors.files">
-      <fileset dir="${build-quick.dir}/classes/library">
-        <include name="scala/actors/**"/>
-      </fileset>
+      <fileset dir="${build-quick.dir}/classes/actors"/>
     </path>
 
     <path id="pack.compiler.files">
       <fileset dir="${build-quick.dir}/classes/compiler"/>
+      <fileset dir="${build-quick.dir}/classes/msil"/>
       <fileset dir="${asm-classes}"/>
       <fileset dir="${fjbg-classes}"/>
     </path>
@@ -593,8 +614,11 @@ targets exercised:
       <path refid="forkjoin.classpath"/>
       <path refid="aux.libs"/>
     </path>
-    <path id="strap.actors.build.path" refid="strap.library.build.path"/>
-    <path id="strap.msil.build.path" refid="strap.compiler.build.path"/>
+
+    <path id="strap.msil.build.path">
+      <path refid="strap.compiler.build.path"/>
+      <pathelement location="${build-strap.dir}/classes/msil"/>
+    </path>
 
     <path id="strap.reflect.build.path">
       <path refid="strap.library.build.path"/>
@@ -604,6 +628,7 @@ targets exercised:
     <path id="strap.compiler.build.path">
       <path refid="strap.reflect.build.path"/>
       <pathelement location="${build-strap.dir}/classes/compiler"/>
+      <pathelement location="${build-strap.dir}/classes/msil"/>
       <path refid="asm.classpath"/>
       <path refid="fjbg.classpath"/>
       <pathelement location="${jline.jar}"/>
@@ -775,6 +800,7 @@ targets exercised:
     <attribute name="args" default=""/>                  <!-- additional args -->
     <attribute name="destproject" default="@{project}"/> <!-- overrides the output directory; used when building multiple projects into the same directory-->
     <attribute name="srcdir" default="@{project}"/>
+    <attribute name="java-excludes" default=""/>
 
     <sequential>
       <if><equals arg1="@{srcpath}" arg2="NOT SET"/><then>
@@ -824,20 +850,17 @@ targets exercised:
     <attribute name="srcpath"       default="NOT SET"/>        <!-- needed to compile the library -->
     <attribute name="args"          default=""/>                  <!-- additional args -->
     <attribute name="includes"      default="comp.includes"/>
+    <attribute name="java-excludes" default=""/>
     <attribute name="version"       default=""/> <!-- non-empty for partest and scaladoc: use @{version}.version.number in property file-->
 
-    <element name="pre" optional="true"/>
-    <element name="post" optional="true"/>
-
     <sequential>
       <staged-uptodate stage="@{stage}" project="@{project}">
         <check><srcfiles dir="${src.dir}/@{project}"/></check>
         <do>
           <stopwatch name="@{stage}.@{project}.timer"/>
           <mkdir dir="${build-@{stage}.dir}/classes/@{project}"/>
-          <pre/>
-          <staged-scalac with="@{with}" stage="@{stage}" project="@{project}" srcpath="@{srcpath}" args="@{args}"/>
-          <post/>
+          <staged-javac stage="@{stage}" project="@{project}" excludes="@{java-excludes}"/> <!-- HACK: always compile with javac -->
+          <staged-scalac with="@{with}" stage="@{stage}" project="@{project}" srcpath="@{srcpath}" args="@{args}" java-excludes="@{java-excludes}"/>
           <if><equals arg1="@{version}" arg2=""/><then>
             <propertyfile file = "${build-@{stage}.dir}/classes/@{project}/@{project}.properties">
               <entry key       = "version.number" value="${version.number}"/>
@@ -990,23 +1013,23 @@ targets exercised:
 <!-- ===========================================================================
                                   LOCAL REFERENCE BUILD (LOCKER)
 ============================================================================ -->
-  <target name="locker.start" depends="asm.done, forkjoin.done, fjbg.done">
+  <target name="locker.start"  depends="asm.done, forkjoin.done, fjbg.done">
     <condition property="locker.locked"><available file="${build-locker.dir}/locker.locked"/></condition></target>
 
-  <target name="locker.lib"     depends="locker.start" unless="locker.locked">
-    <staged-build with="starr" stage="locker" project="library" srcpath="${src.dir}/library" includes="lib.includes">
-            <pre><staged-javac stage="locker" project="library" args="-XDignore.symbol.file"/></pre></staged-build></target>
-            <!-- TODO: args="-XDignore.symbol.file" necessary?? -->
-
-  <target name="locker.reflect" depends="locker.lib"     unless="locker.locked"> <staged-build with="starr" stage="locker" project="reflect"/></target>
-  <target name="locker.comp"    depends="locker.reflect" unless="locker.locked">
-    <staged-build with="starr" stage="locker" project="compiler">
-      <pre>
-        <staged-javac stage="locker" project="msil" destproject="compiler" excludes="**/tests/**"/>
-        <staged-scalac with="starr" stage="locker" project="msil" destproject="compiler"/>
-      </pre>
-    </staged-build>
-  </target>
+  <target name="locker.lib"    depends="locker.start"     unless="locker.locked">
+    <staged-build with="starr" stage="locker" project="library" srcpath="${src.dir}/library" includes="lib.includes"/></target>
+
+  <target name="locker.actors" depends="locker.lib"       unless="locker.locked">
+    <staged-build with="starr" stage="locker" project="actors"/> </target>
+
+  <target name="locker.msil"   depends="locker.lib"       unless="locker.locked">
+    <staged-build with="starr" stage="locker" project="msil" java-excludes="**/tests/**"/> </target>
+
+  <target name="locker.reflect" depends="locker.lib"      unless="locker.locked">
+    <staged-build with="starr" stage="locker" project="reflect"/></target>
+
+  <target name="locker.comp"    depends="locker.reflect, locker.msil" unless="locker.locked">
+    <staged-build with="starr" stage="locker" project="compiler"/></target>
 
   <target name="locker.done"    depends="locker.comp">
     <mkdir dir="${build-locker.dir}"/>
@@ -1021,45 +1044,31 @@ targets exercised:
   <target name="quick.start" depends="locker.done"/>
 
   <target name="quick.lib" depends="quick.start">
-    <staged-build with="locker" stage="quick" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes">
-      <pre>
-        <staged-javac stage="quick" project="library" args="-XDignore.symbol.file"/> <!-- TODO: args="-XDignore.symbol.file" necessary?? -->
-        <staged-javac stage="quick" project="actors" destproject="library"/>
-      </pre>
-      <post>
-        <staged-scalac with="locker" stage="quick" project="actors" destproject="library"/>
-      </post>
-    </staged-build>
-  </target>
+    <staged-build with="locker" stage="quick" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes"/></target>
 
-  <target name="quick.reflect" depends="quick.lib"> <staged-build with="locker" stage="quick" project="reflect"/> </target>
+  <target name="quick.actors"     depends="quick.lib">
+    <staged-build with="locker" stage="quick" project="actors"/> </target>
 
-  <target name="quick.comp" depends="quick.reflect">
-    <staged-build with="locker" stage="quick" project="compiler">
-      <pre>
-        <staged-javac stage="quick" project="msil" destproject="compiler" excludes="**/tests/**"/>
-        <staged-scalac with="locker" stage="quick" project="msil" destproject="compiler"/>
-      </pre>
-    </staged-build>
-  </target>
+  <target name="quick.msil"       depends="quick.lib">
+    <staged-build with="locker" stage="quick" project="msil" java-excludes="**/tests/**"/> </target>
 
-  <target name="quick.scalacheck" depends="quick.lib">
-    <staged-build with="locker" stage="quick" project="scalacheck" args="-nowarn"/>
-  </target>
+  <target name="quick.reflect"    depends="quick.lib">
+    <staged-build with="locker" stage="quick" project="reflect"/> </target>
 
-  <target name="quick.scalap" depends="quick.comp">
-    <staged-build with="locker" stage="quick" project="scalap"/>
-  </target>
+  <target name="quick.comp"       depends="quick.reflect, quick.msil">
+    <staged-build with="locker" stage="quick" project="compiler"/> </target>
 
-  <target name="quick.partest" depends="quick.scalap, quick.comp, asm.done">
-    <staged-build with="locker" stage="quick" project="partest" version="partest">
-      <pre><staged-javac stage="quick" project="partest"/></pre>
-    </staged-build>
-  </target>
+  <target name="quick.scalacheck" depends="quick.actors, quick.lib">
+    <staged-build with="locker" stage="quick" project="scalacheck" args="-nowarn"/> </target>
 
-  <target name="quick.swing" depends="quick.lib" if="has.java6">
-    <staged-build with="locker" stage="quick" project="swing"/>
-  </target>
+  <target name="quick.scalap"     depends="quick.comp">
+    <staged-build with="locker" stage="quick" project="scalap"/> </target>
+
+  <target name="quick.partest"    depends="quick.scalap, quick.comp, asm.done">
+    <staged-build with="locker" stage="quick" project="partest" version="partest"/> </target>
+
+  <target name="quick.swing"      depends="quick.actors, quick.lib" if="has.java6">
+    <staged-build with="locker" stage="quick" project="swing"/> </target>
 
   <target name="quick.plugins" depends="quick.comp">
     <staged-uptodate stage="quick" project="plugins">
@@ -1079,7 +1088,12 @@ targets exercised:
 
         <!-- might split off library part into its own ant target -->
         <mkdir dir="${build-quick.dir}/classes/continuations-library"/>
-        <!-- have to compile with quick compiler here! -->
+        <!-- TODO: must build with quick to avoid
+        [quick.plugins] error: java.lang.NoClassDefFoundError: scala/tools/nsc/transform/patmat/PatternMatching
+        [quick.plugins] 	at scala.tools.selectivecps.SelectiveCPSTransform.newTransformer(SelectiveCPSTransform.scala:29)
+
+        WHY OH WHY!? scala/tools/nsc/transform/patmat/PatternMatching should be on locker.compiler.path
+        -->
         <staged-scalac with="quick" stage="quick" project="plugins"
                        srcdir="continuations/library" destproject="continuations-library"
                        args="-Xplugin-require:continuations -P:continuations:enable -Xpluginsdir ${build-quick.dir}/misc/scala-devel/plugins"/>
@@ -1161,28 +1175,13 @@ targets exercised:
 <!-- ===========================================================================
                                   BOOTSTRAPPING BUILD (STRAP)
 ============================================================================ -->
-  <target name="strap.lib" depends="quick.done">
-    <staged-build with="quick" stage="strap" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes">
-      <pre>
-        <staged-javac stage="strap" project="library" args="-XDignore.symbol.file"/> <!-- TODO: args="-XDignore.symbol.file" necessary?? -->
-        <staged-javac stage="strap" project="actors" destproject="library"/>
-      </pre>
-      <post>
-        <staged-scalac with="quick" stage="strap" project="actors" destproject="library"/>
-      </post>
-    </staged-build>
+  <target name="strap.done" depends="pack.done">
+    <staged-build with="pack" stage="strap" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes"/>
+    <staged-build with="pack" stage="strap" project="msil" java-excludes="**/tests/**"/>
+    <staged-build with="pack" stage="strap" project="reflect"/>
+    <staged-build with="pack" stage="strap" project="compiler"/>
   </target>
 
-  <target name="strap.reflect" depends="strap.lib"> <staged-build with="pack" stage="strap" project="reflect"/> </target>
-  <target name="strap.comp"    depends="strap.reflect">
-    <staged-build with="pack" stage="strap" project="compiler">
-      <pre>
-        <staged-javac stage="strap" project="msil" destproject="compiler" excludes="**/tests/**"/>
-        <staged-scalac with="quick" stage="strap" project="msil" destproject="compiler"/>
-      </pre>
-    </staged-build>
-  </target>
-  <target name="strap.done"    depends="strap.comp"/>
   <target name="strap-opt" description="Optimized version of strap.done."> <optimized name="strap.done"/></target>
 
 
@@ -1278,7 +1277,7 @@ targets exercised:
                                   TEST SUITE
 ============================================================================ -->
   <!-- bootstrapping stability: compare {quick,strap}/(lib|reflect|comp) -->
-  <target name="test.stability" depends="quick.lib, quick.reflect, quick.comp, strap.lib, strap.reflect, strap.comp">
+  <target name="test.stability" depends="strap.done">
     <exec osfamily="unix" vmlauncher="false" executable="${basedir}/tools/stability-test.sh" failonerror="true" />
     <!-- I think doing it this way means it will auto-pass on windows... that's the idea. If not, something like this. -->
     <!-- <exec osfamily="windows" executable="foo" failonerror="false" failifexecutionfails="false" /> -->
-- 
cgit v1.2.3


From 7c0e8f025a8e197acef1de0d17d7562904f5d267 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 1 Apr 2013 23:56:55 -0700
Subject: Preliminary support for zinc.

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 does not work if locker is only classfiles, needs jars
     TODO rework the build to pack locker and build using that when using zinc?)

Mostly to enable dog fooding of incremental compilation work for now.
---
 build.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 3d2f9f5faa..d7097b53a6 100644
--- a/build.xml
+++ b/build.xml
@@ -19,6 +19,14 @@ targets exercised:
   build-opt nightly test.suite test.continuations.suite test.scaladoc locker.done
 -->
 
+<!-- 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
+     TODO rework the build to pack locker and build using that when using zinc)
+-->
+
 
 <!-- ===========================================================================
                                   END-USER TARGETS
@@ -792,6 +800,49 @@ targets exercised:
     </sequential>
   </macrodef>
 
+  <!-- Zinc assumes a one-to-one correspondence of output folder to set of source files.
+   When compiling different sets of source files in multiple compilations to the same output directory,
+   Zinc thinks source files that appeared in an earlier compilation but are absent in the current one,
+   were deleted and thus deletes the corresponding output files.
+
+   Note that zinc also requires each arg to scalac to be prefixed by -S.
+  -->
+  <macrodef name="zinc">
+    <attribute name="compilerpathref"   />
+    <attribute name="destdir"           />
+    <attribute name="srcdir"            />
+    <attribute name="srcpath" default="NOT SET"/>        <!-- needed to compile the library -->
+    <attribute name="buildpathref"      />
+    <attribute name="params" default="" />
+    <attribute name="java-excludes" default=""/>
+
+    <sequential>
+      <local name="sources"/>
+      <pathconvert pathsep=" " property="sources">
+        <fileset dir="@{srcdir}">
+          <include name="**/*.java"/>
+          <include name="**/*.scala"/>
+          <exclude name="@{java-excludes}"/>
+        </fileset>
+      </pathconvert>
+      <local name="args"/>
+      <local name="sargs"/>
+      <if><not><equals arg1="@{srcpath}" arg2="NOT SET"/></not><then>
+        <property name="args" value="@{params} -sourcepath @{srcpath}"/>
+      </then></if>
+      <property name="args" value="@{params}"/> <!-- default -->
+
+      <!-- HACK: prefix scalac args by -S -->
+      <script language="javascript">
+        project.setProperty("sargs", project.getProperty("args").trim().replaceAll(" ", " -S"));
+      </script>
+
+      <exec osfamily="unix" executable="tools/zinc" failifexecutionfails="true" failonerror="true">
+        <arg line="-nailed -compile-order JavaThenScala -scala-path ${ant.refid:@{compilerpathref}} -d @{destdir} -classpath ${toString:@{buildpathref}} ${sargs} ${sources}"/>
+      </exec>
+    </sequential>
+  </macrodef>
+
   <macrodef name="staged-scalac" >
     <attribute name="with"/>           <!-- will use path `@{with}.compiler.path` to locate scalac -->
     <attribute name="stage"/>          <!-- current stage (locker, quick, strap) -->
@@ -803,6 +854,21 @@ targets exercised:
     <attribute name="java-excludes" default=""/>
 
     <sequential>
+      <!-- use zinc for the quick stage if it's available;
+           would use it for locker but something is iffy in sbt: get a class cast error on global phase -->
+      <if><and> <available file="tools/zinc"/>
+                <equals arg1="@{stage}" arg2="quick"/>
+                <not><equals arg1="@{project}" arg2="plugins"/></not> <!-- doesn't work in zinc because it requires the quick compiler, which isn't jarred up-->
+          </and><then>
+        <zinc taskname="Z.@{stage}.@{project}"
+          compilerpathref="@{with}.compiler.path"
+          destdir="${build-@{stage}.dir}/classes/@{destproject}"
+          srcdir="${src.dir}/@{srcdir}"
+          srcpath="@{srcpath}"
+          buildpathref="@{stage}.@{project}.build.path"
+          params="${scalac.args.@{stage}} @{args}"
+          java-excludes="@{java-excludes}"/></then>
+      <else>
       <if><equals arg1="@{srcpath}" arg2="NOT SET"/><then>
         <scalacfork taskname="@{stage}.@{project}"
           jvmargs="${scalacfork.jvmargs}"
@@ -823,6 +889,7 @@ targets exercised:
           <include name="**/*.scala"/>
           <compilationpath refid="@{stage}.@{project}.build.path"/></scalacfork></else>
       </if>
+      </else></if>
     </sequential>
   </macrodef>
 
-- 
cgit v1.2.3


From 92a17850f18a5d457e79be7e83bcb0567fe72e54 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 2 Apr 2013 00:14:40 -0700
Subject: formatting

---
 build.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index d7097b53a6..052b10f4fd 100644
--- a/build.xml
+++ b/build.xml
@@ -1108,37 +1108,37 @@ targets exercised:
 <!-- ===========================================================================
                                   QUICK BUILD (QUICK)
 ============================================================================ -->
-  <target name="quick.start" depends="locker.done"/>
+  <target name="quick.start"      depends="locker.done"/>
 
-  <target name="quick.lib" depends="quick.start">
-    <staged-build with="locker" stage="quick" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes"/></target>
+  <target name="quick.lib"        depends="quick.start">
+    <staged-build with="locker"   stage="quick" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes"/></target>
 
   <target name="quick.actors"     depends="quick.lib">
-    <staged-build with="locker" stage="quick" project="actors"/> </target>
+    <staged-build with="locker"   stage="quick" project="actors"/> </target>
 
   <target name="quick.msil"       depends="quick.lib">
-    <staged-build with="locker" stage="quick" project="msil" java-excludes="**/tests/**"/> </target>
+    <staged-build with="locker"   stage="quick" project="msil" java-excludes="**/tests/**"/> </target>
 
   <target name="quick.reflect"    depends="quick.lib">
-    <staged-build with="locker" stage="quick" project="reflect"/> </target>
+    <staged-build with="locker"   stage="quick" project="reflect"/> </target>
 
   <target name="quick.comp"       depends="quick.reflect, quick.msil">
-    <staged-build with="locker" stage="quick" project="compiler"/> </target>
+    <staged-build with="locker"   stage="quick" project="compiler"/> </target>
 
   <target name="quick.scalacheck" depends="quick.actors, quick.lib">
-    <staged-build with="locker" stage="quick" project="scalacheck" args="-nowarn"/> </target>
+    <staged-build with="locker"   stage="quick" project="scalacheck" args="-nowarn"/> </target>
 
   <target name="quick.scalap"     depends="quick.comp">
-    <staged-build with="locker" stage="quick" project="scalap"/> </target>
+    <staged-build with="locker"   stage="quick" project="scalap"/> </target>
 
   <target name="quick.partest"    depends="quick.scalap, quick.comp, asm.done">
-    <staged-build with="locker" stage="quick" project="partest" version="partest"/> </target>
+    <staged-build with="locker"   stage="quick" project="partest" version="partest"/> </target>
 
   <target name="quick.swing"      depends="quick.actors, quick.lib" if="has.java6">
-    <staged-build with="locker" stage="quick" project="swing"/> </target>
+    <staged-build with="locker"   stage="quick" project="swing"/> </target>
 
-  <target name="quick.plugins" depends="quick.comp">
-    <staged-uptodate stage="quick" project="plugins">
+  <target name="quick.plugins"    depends="quick.comp">
+    <staged-uptodate              stage="quick" project="plugins">
       <check><srcfiles dir="${src.dir}/continuations"/></check>
       <do>
         <stopwatch name="quick.plugins.timer"/>
-- 
cgit v1.2.3


From 6591acbd01ee4035385cd25b8503faaa42a0506c Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 2 Apr 2013 17:45:57 -0700
Subject: comments to address reviewer feedback

---
 build.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 052b10f4fd..9a26336248 100644
--- a/build.xml
+++ b/build.xml
@@ -23,8 +23,15 @@ targets exercised:
   - 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
-     TODO rework the build to pack locker and build using that when using zinc)
+    (zinc needs compiler jars)
+-->
+
+<!--
+TODO:
+  - detect zinc anywhere on PATH
+  - automatically set ZINC_OPTS
+  - skip locker (and test.stability) by default to speed up PR validation, still do full build & testing during nightly
+  - (rework the build to pack locker and build using that when using zinc)
 -->
 
 
@@ -811,7 +818,7 @@ targets exercised:
     <attribute name="compilerpathref"   />
     <attribute name="destdir"           />
     <attribute name="srcdir"            />
-    <attribute name="srcpath" default="NOT SET"/>        <!-- needed to compile the library -->
+    <attribute name="srcpath" default="NOT SET"/>        <!-- needed to compile the library, "NOT SET" is just a convention to denote an optional attribute -->
     <attribute name="buildpathref"      />
     <attribute name="params" default="" />
     <attribute name="java-excludes" default=""/>
@@ -854,7 +861,8 @@ targets exercised:
     <attribute name="java-excludes" default=""/>
 
     <sequential>
-      <!-- use zinc for the quick stage if it's available;
+      <!-- TODO: detect zinc anywhere on PATH
+           use zinc for the quick stage if it's available;
            would use it for locker but something is iffy in sbt: get a class cast error on global phase -->
       <if><and> <available file="tools/zinc"/>
                 <equals arg1="@{stage}" arg2="quick"/>
@@ -926,7 +934,7 @@ targets exercised:
         <do>
           <stopwatch name="@{stage}.@{project}.timer"/>
           <mkdir dir="${build-@{stage}.dir}/classes/@{project}"/>
-          <staged-javac stage="@{stage}" project="@{project}" excludes="@{java-excludes}"/> <!-- HACK: always compile with javac -->
+          <staged-javac stage="@{stage}" project="@{project}" excludes="@{java-excludes}"/> <!-- always compile with javac for simplicity and regularity; it's cheap -->
           <staged-scalac with="@{with}" stage="@{stage}" project="@{project}" srcpath="@{srcpath}" args="@{args}" java-excludes="@{java-excludes}"/>
           <if><equals arg1="@{version}" arg2=""/><then>
             <propertyfile file = "${build-@{stage}.dir}/classes/@{project}/@{project}.properties">
-- 
cgit v1.2.3