From 9923b97157725ae1f7853a4834ef5e31283a1b98 Mon Sep 17 00:00:00 2001
From: Aleksandar Pokopec <aleksandar.prokopec@epfl.ch>
Date: Fri, 18 Jun 2010 15:06:17 +0000
Subject: Moved parallel collections to library dir, chan...

Moved parallel collections to library dir, changed sabbus script. Added
`par` to some of the classes. No review.
---
 build.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index c0593415fc..228f6faf21 100644
--- a/build.xml
+++ b/build.xml
@@ -304,6 +304,7 @@ LOCAL REFERENCE BUILD (LOCKER)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-locker.dir}/classes/library"/>
+        <pathelement location="${lib.dir}/forkjoin.jar"/>
       </compilationpath>
     </scalacfork>
     <propertyfile file="${build-locker.dir}/classes/library/library.properties">
@@ -444,7 +445,7 @@ QUICK BUILD (QUICK)
         <include name="library/**"/>
         <include name="dbc/**"/>
         <include name="actors/**"/>
-	<include name="parallel-collections/**"/>
+	<!--<include name="parallel-collections/**"/>-->
         <include name="continuations/**"/>
         <include name="swing/**"/>
       </srcfiles>
@@ -480,6 +481,7 @@ QUICK BUILD (QUICK)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
+        <pathelement location="${lib.dir}/forkjoin.jar"/>
       </compilationpath>
     </scalacfork>
     <scalacfork
@@ -494,7 +496,7 @@ QUICK BUILD (QUICK)
         <pathelement location="${lib.dir}/forkjoin.jar"/>
       </compilationpath>
     </scalacfork>
-    <scalacfork
+    <!--<scalacfork
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
       params="${scalac.args.quick}"
@@ -505,7 +507,7 @@ QUICK BUILD (QUICK)
         <pathelement location="${build-quick.dir}/classes/library"/>
         <pathelement location="${lib.dir}/forkjoin.jar"/>
       </compilationpath>
-    </scalacfork>
+    </scalacfork>-->
     <scalacfork
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
@@ -1011,6 +1013,7 @@ BOOTSTRAPPING BUILD (STRAP)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
+        <pathelement location="${forkjoin.jar}"/>
       </compilationpath>
     </scalacfork>
     <scalacfork
@@ -1025,7 +1028,7 @@ BOOTSTRAPPING BUILD (STRAP)
         <pathelement location="${forkjoin.jar}"/>
       </compilationpath>
     </scalacfork>
-    <scalacfork
+    <!--<scalacfork
       destdir="${build-strap.dir}/classes/library"
       compilerpathref="pack.classpath"
       params="${scalac.args.all}"
@@ -1036,7 +1039,7 @@ BOOTSTRAPPING BUILD (STRAP)
         <pathelement location="${build-strap.dir}/classes/library"/>
         <pathelement location="${forkjoin.jar}"/>
       </compilationpath>
-    </scalacfork>
+    </scalacfork>-->
     <scalacfork
       destdir="${build-strap.dir}/classes/library"
       compilerpathref="pack.classpath"
@@ -1393,7 +1396,7 @@ DOCUMENTATION
         <include name="library/**"/>
         <include name="dbc/**"/>
         <include name="actors/**"/>
-	<include name="parallel-collections/**"/>
+	<!--<include name="parallel-collections/**"/>-->
         <include name="swing/**"/>
       </srcfiles>
     </uptodate>
@@ -1411,7 +1414,7 @@ DOCUMENTATION
       classpathref="pack.classpath">
       <src>
         <files includes="${src.dir}/actors"/>
-	<files includes="${src.dir}/parallel-collections"/>
+	<!--<files includes="${src.dir}/parallel-collections"/>-->
         <files includes="${src.dir}/library/scala"/>
         <files includes="${src.dir}/swing"/>
         <files includes="${src.dir}/continuations/library"/>
@@ -1650,7 +1653,7 @@ DISTRIBUTION
     <jar destfile="${dist.dir}/src/scala-library-src.jar">
       <fileset dir="${src.dir}/library"/>
       <fileset dir="${src.dir}/actors"/>
-      <fileset dir="${src.dir}/parallel-collections"/>
+      <!--<fileset dir="${src.dir}/parallel-collections"/>-->
       <fileset dir="${src.dir}/continuations/library"/>
     </jar>
     <jar destfile="${dist.dir}/src/scala-dbc-src.jar">
@@ -1739,7 +1742,7 @@ STABLE REFERENCE (STARR)
     <jar destfile="${basedir}/lib/scala-library-src.jar">
       <fileset dir="${basedir}/src/library"/>
       <fileset dir="${basedir}/src/actors"/>
-      <fileset dir="${basedir}/src/parallel-collections"/>
+      <!--<fileset dir="${basedir}/src/parallel-collections"/>-->
       <fileset dir="${basedir}/src/swing"/>
       <fileset dir="${basedir}/src/dbc"/>
     </jar>
-- 
cgit v1.2.3