Formatting. Introduce {asm,forkjoin,fjbg}-classes props.

1 files changed, 79 insertions, 74 deletions

diff --git a/build.xml b/build.xml
index e2e25df9de..41c256f4ad 100644
--- a/build.xml
+++ b/build.xml
@@ -74,18 +74,18 @@ targets exercised:
 
   <property environment="env"/>
   <!-- Prevents system classpath from being used -->
-  <property name="build.sysclasspath" value="ignore"/>
+  <property name="build.sysclasspath"     value="ignore"/>
 
   <!-- Defines the repository layout -->
-  <property name="docs.dir" value="${basedir}/docs"/>
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="src.dir" value="${basedir}/src"/>
-  <property name="partest.dir" value="${basedir}/test"/>
+  <property name="docs.dir"               value="${basedir}/docs"/>
+  <property name="lib.dir"                value="${basedir}/lib"/>
+  <property name="src.dir"                value="${basedir}/src"/>
+  <property name="partest.dir"            value="${basedir}/test"/>
 
-  <property name="lib-ant.dir" value="${lib.dir}/ant"/>
+  <property name="lib-ant.dir"            value="${lib.dir}/ant"/>
   <!-- For developers: any jars placed in this dir will be added to the classpath
        of all targets and copied into quick/pack/etc builds. -->
-  <property name="lib-extra.dir" value="${lib.dir}/extra"/>
+  <property name="lib-extra.dir"          value="${lib.dir}/extra"/>
 
   <!-- Loads custom properties definitions -->
   <property file="${basedir}/build.properties"/>
@@ -93,45 +93,47 @@ targets exercised:
   <property file="${basedir}/build.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"/>
-  <property name="compiler.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
-  <property name="msil.starr.jar" value="${lib.dir}/msil.jar"/>
-  <property name="jline.jar" value="${lib.dir}/jline.jar"/>
-  <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
-  <property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/>
+  <property name="library.starr.jar"       value="${lib.dir}/scala-library.jar"/>
+  <property name="reflect.starr.jar"       value="${lib.dir}/scala-reflect.jar"/>
+  <property name="compiler.starr.jar"      value="${lib.dir}/scala-compiler.jar"/>
+  <property name="msil.starr.jar"          value="${lib.dir}/msil.jar"/>
+  <property name="jline.jar"               value="${lib.dir}/jline.jar"/>
+  <property name="ant.jar"                 value="${ant.home}/lib/ant.jar"/>
+  <property name="scalacheck.jar"          value="${lib.dir}/scalacheck.jar"/>
 
   <!-- Sets location of build folders -->
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="build-asm.dir" value="${build.dir}/asm"/>
-  <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-pack.dir" value="${build.dir}/pack"/>
-  <property name="build-osgi.dir" value="${build.dir}/osgi"/>
-  <property name="build-strap.dir" value="${build.dir}/strap"/>
-  <property name="build-docs.dir" value="${build.dir}/scaladoc"/>
-  <property name="build-libs.dir" value="${build.dir}/libs"/>
-  <property name="build-sbt.dir" value="${build.dir}/sbt-interface"/>
-
-  <property name="test.osgi.src" value="${partest.dir}/osgi/src"/>
-  <property name="test.osgi.classes" value="${build-osgi.dir}/classes"/>
-
-  <property name="dists.dir" value="${basedir}/dists"/>
-
-  <property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/>
-  <property name="partest.version.number" value="0.9.2"/>
+  <property name="build.dir"               value="${basedir}/build"/>
+  <property name="build-libs.dir"          value="${build.dir}/libs"/>
+  <property name="build-asm.dir"           value="${build.dir}/asm"/>
+  <property name="build-fjbg.dir"          value="${build-libs.dir}"/>
+  <property name="build-forkjoin.dir"      value="${build-libs.dir}"/>
+  <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-pack.dir"          value="${build.dir}/pack"/>
+  <property name="build-osgi.dir"          value="${build.dir}/osgi"/>
+  <property name="build-strap.dir"         value="${build.dir}/strap"/>
+  <property name="build-docs.dir"          value="${build.dir}/scaladoc"/>
+  <property name="build-sbt.dir"           value="${build.dir}/sbt-interface"/>
+
+  <property name="test.osgi.src"           value="${partest.dir}/osgi/src"/>
+  <property name="test.osgi.classes"       value="${build-osgi.dir}/classes"/>
+
+  <property name="dists.dir"               value="${basedir}/dists"/>
+
+  <property name="copyright.string"        value="Copyright 2002-2013, LAMP/EPFL"/>
+  <property name="partest.version.number"  value="0.9.2"/>
 
   <!-- These are NOT the flags used to run SuperSabbus, but the ones written
        into the script runners created with scala.tools.ant.ScalaTool -->
-  <property name="java.flags" value="-Xmx256M -Xms32M"/>
-  <property name="jvm.opts" value=""/>
+  <property name="java.flags"              value="-Xmx256M -Xms32M"/>
+  <property name="jvm.opts"                value=""/>
 
   <!-- 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="-Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC" />
+  <property name="env.ANT_OPTS"            value="-Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC" />
 
-  <property name="scalacfork.jvmargs" value="${env.ANT_OPTS} ${jvm.opts}"/>
+  <property name="scalacfork.jvmargs"      value="${env.ANT_OPTS} ${jvm.opts}"/>
 
 <!-- ===========================================================================
                                   INITIALIZATION
@@ -211,7 +213,7 @@ targets exercised:
         </artifact:dependencies>
       </then></if>
 
-      <property name="maven-deps-done" value="yep!"/>
+      <property name="maven-deps-done"     value="yep!"/>
     </then></if>
 
     <!-- NOTE: ant properties are write-once: second writes are silently discarded; the logic below relies on this -->
@@ -228,30 +230,30 @@ targets exercised:
           - `version.suffix == maven.version.suffix == ""`
     -->
     <if><not><equals arg1="${version.bnum}" arg2="0"/></not><then>
-      <property name="version.suffix" value="-${version.bnum}"/>
+      <property name="version.suffix"          value="-${version.bnum}"/>
     </then></if>
 
     <if><or><not><isset property="version.suffix"/></not><equals arg1="${version.suffix}" arg2=""/></or><then>
       <if><isset property="build.release"/><then>
-        <property name="maven.version.suffix" value=""/>
-        <property name="version.suffix" value="${maven.version.suffix}"/>
+        <property name="maven.version.suffix"  value=""/>
+        <property name="version.suffix"        value="${maven.version.suffix}"/>
         <if><equals arg1="${maven.version.suffix}" arg2=""/><then>
           <property name="osgi.version.suffix" value="-VFINAL"/></then>
         <else>
           <property name="osgi.version.suffix" value="${maven.version.suffix}"/></else></if></then></if></then>
     <else> <!-- version.suffix set and not empty -->
-      <property name="maven.version.suffix" value="${version.suffix}"/>
-      <property name="osgi.version.suffix"  value="${version.suffix}"/></else></if>
+      <property name="maven.version.suffix"    value="${version.suffix}"/>
+      <property name="osgi.version.suffix"     value="${version.suffix}"/></else></if>
 
     <!-- not building a release and no version.suffix specified -->
-    <property name="maven.version.suffix" value="-SNAPSHOT"/>
+    <property name="maven.version.suffix"      value="-SNAPSHOT"/>
 
     <if><equals arg1="${maven.version.suffix}" arg2="-SNAPSHOT"/><then>
-      <property name="osgi.version.suffix" value=""/>
-      <property name="version.suffix" value=""/></then>
+      <property name="osgi.version.suffix"     value=""/>
+      <property name="version.suffix"          value=""/></then>
     <else>
-      <property name="osgi.version.suffix" value="${maven.version.suffix}"/>
-      <property name="version.suffix" value="${maven.version.suffix}"/></else></if>
+      <property name="osgi.version.suffix"     value="${maven.version.suffix}"/>
+      <property name="version.suffix"          value="${maven.version.suffix}"/></else></if>
 
 
     <exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
@@ -268,8 +270,8 @@ targets exercised:
     </exec>
 
     <!-- some default in case something went wrong getting the revision -->
-    <property name="git.commit.sha" value="unknown"/>
-    <property name="git.commit.date" value="unknown"/>
+    <property name="git.commit.sha"          value="unknown"/>
+    <property name="git.commit.date"         value="unknown"/>
 
     <!-- We use the git describe to determine the OSGi modifier for our build. -->
     <property name="maven.version.number"
@@ -278,9 +280,9 @@ targets exercised:
       value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${osgi.version.suffix}-${git.commit.sha}"/>
 
     <if><isset property="build.release"/><then>
-      <property name="version.number" value="${maven.version.number}"/>
+      <property name="version.number"        value="${maven.version.number}"/>
     </then><else>
-      <property name="version.number" value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
+      <property name="version.number"        value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
     </else></if>
 
     <condition property="has.java6">
@@ -306,27 +308,27 @@ targets exercised:
     </then></if>
 
     <!-- Allow this to be overridden simply -->
-    <property name="sbt.latest.version" value="0.12.2"/>
+    <property name="sbt.latest.version"    value="0.12.2"/>
 
-    <property name="sbt.src.dir" value="${build-sbt.dir}/${sbt.latest.version}/src"/>
-    <property name="sbt.lib.dir" value="${build-sbt.dir}/${sbt.latest.version}/lib"/>
+    <property name="sbt.src.dir"           value="${build-sbt.dir}/${sbt.latest.version}/src"/>
+    <property name="sbt.lib.dir"           value="${build-sbt.dir}/${sbt.latest.version}/lib"/>
 
-    <property name="sbt.interface.jar" value="${sbt.lib.dir}/interface.jar"/>
-    <property name="sbt.interface.url" value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/>
+    <property name="sbt.interface.jar"     value="${sbt.lib.dir}/interface.jar"/>
+    <property name="sbt.interface.url"     value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/>
     <property name="sbt.interface.src.jar" value="${sbt.src.dir}/compiler-interface-src.jar"/>
     <property name="sbt.interface.src.url" value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/>
 
 
     <!-- Additional command line arguments for scalac. They are added to all build targets -->
-    <property name="scalac.args" value=""/>
-    <property name="javac.args" value=""/>
+    <property name="scalac.args"           value=""/>
+    <property name="javac.args"            value=""/>
 
-    <property name="scalac.args.always" value="" />
-    <property name="scalac.args.optimise" value=""/> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
-    <property name="scalac.args.all" value="${scalac.args.always} ${scalac.args} ${scalac.args.optimise}"/>
-    <property name="scalac.args.locker" value="${scalac.args.all}"/>
-    <property name="scalac.args.quick" value="${scalac.args.all}"/>
-    <property name="scalac.args.strap" value="${scalac.args.quick}"/>
+    <property name="scalac.args.always"    value="" />
+    <property name="scalac.args.optimise"  value=""/> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
+    <property name="scalac.args.all"       value="${scalac.args.always} ${scalac.args} ${scalac.args.optimise}"/>
+    <property name="scalac.args.locker"    value="${scalac.args.all}"/>
+    <property name="scalac.args.quick"     value="${scalac.args.all}"/>
+    <property name="scalac.args.strap"     value="${scalac.args.quick}"/>
 
     <!-- This is the start time for the distribution -->
     <tstamp prefix="time">
@@ -335,8 +337,8 @@ targets exercised:
     </tstamp>
 
     <!-- some default in case something went wrong getting the revision -->
-    <property name="version.number" value="-unknown-"/>
-    <property name="init.avail" value="yes"/>
+    <property name="version.number"       value="-unknown-"/>
+    <property name="init.avail"           value="yes"/>
 
     <!-- Local libs (developer use.) -->
     <mkdir dir="${lib-extra.dir}"/>
@@ -390,7 +392,10 @@ targets exercised:
 
     <path id="forkjoin.classpath" path="${build-libs.dir}/classes/forkjoin"/>
     <path id="fjbg.classpath"     path="${build-libs.dir}/classes/fjbg"/>
-    <path id="asm.classpath"      path="${build-asm.dir}/classes/"/>
+    <path id="asm.classpath"      path="${build-asm.dir}/classes"/>
+    <property name="forkjoin-classes" refid="forkjoin.classpath"/>
+    <property name="fjbg-classes" refid="fjbg.classpath"/>
+    <property name="asm-classes" refid="asm.classpath"/>
 
     <!-- Compilers to use for the various stages.
 
@@ -1085,7 +1090,7 @@ targets exercised:
           <exclude name="scala/actors/**"/>
         </fileset>
         <fileset dir="${build-quick.dir}/classes/continuations-library"/>
-        <fileset dir="${build-libs.dir}/classes/forkjoin"/>
+        <fileset dir="${forkjoin-classes}"/>
       </jar>
       <jar whenmanifestonly="fail" destfile="${build-pack.dir}/lib/scala-actors.jar">
         <fileset dir="${build-quick.dir}/classes/library">
@@ -1118,8 +1123,8 @@ targets exercised:
       <jar whenmanifestonly="fail" destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
         <service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/>
         <fileset dir="${build-quick.dir}/classes/compiler"/>
-        <fileset dir="${build-asm.dir}/classes"/>
-        <fileset dir="${build-libs.dir}/classes/fjbg"/>
+        <fileset dir="${asm-classes}"/>
+        <fileset dir="${fjbg-classes}"/>
       </jar>
       <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
       <copy todir="${build-pack.dir}/lib">
@@ -1216,14 +1221,14 @@ targets exercised:
     <mkdir dir="${build-palo.dir}/lib"/>
     <jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-library.jar">
       <fileset dir="${build-locker.dir}/classes/library"/>
-      <fileset dir="${build-libs.dir}/classes/forkjoin"/>
+      <fileset dir="${forkjoin-classes}"/>
     </jar>
     <jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-reflect.jar" manifest="${basedir}/META-INF/MANIFEST.MF"
       basedir="${build-locker.dir}/classes/reflect"/>
     <jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-compiler.jar" manifest="${basedir}/META-INF/MANIFEST.MF">
       <fileset dir="${build-locker.dir}/classes/compiler"/>
-      <fileset dir="${build-asm.dir}/classes/"/>
-      <fileset dir="${build-libs.dir}/classes/fjbg"/>
+      <fileset dir="${asm-classes}"/>
+      <fileset dir="${fjbg-classes}"/>
     </jar>
     <copy file="${jline.jar}" toDir="${build-palo.dir}/lib"/>
   </target>