moved forkjoin sources out of the library folder

1 files changed, 52 insertions, 21 deletions

diff --git a/build.xml b/build.xml
index 849f95e89c..a666f2c52a 100644
--- a/build.xml
+++ b/build.xml
@@ -125,7 +125,7 @@ END-USER TARGETS
   </target>
 
   <target name="newlibs"
-    description="Requires compiler libraries (MSIL and FJBG) to be rebuilt. Add this target before any other if class file format is incompatible.">
+    description="Requires libraries (MSIL, FJBG, FORKJOIN) to be rebuilt. Add this target before any other if class file format is incompatible.">
     <property name="libs.outdated" value="yes"/>
   </target>
 
@@ -234,6 +234,7 @@ INITIALISATION
   <!-- Define tasks that can be run with Starr -->
     <path id="starr.classpath">
       <pathelement location="${lib.starr.jar}"/>
+      <pathelement location="${lib.dir}/forkjoin.jar"/>
       <pathelement location="${comp.starr.jar}"/>
       <pathelement location="${lib.dir}/fjbg.jar"/>
       <pathelement location="${lib.dir}/msil.jar"/>
@@ -318,6 +319,7 @@ LOCAL REFERENCE BUILD (LOCKER)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-locker.dir}/classes/library"/>
+        <pathelement location="${lib.dir}/forkjoin.jar"/>
         <pathelement location="${build-locker.dir}/classes/compiler"/>
         <pathelement location="${lib.dir}/fjbg.jar"/>
         <pathelement location="${lib.dir}/msil.jar"/>
@@ -349,6 +351,7 @@ LOCAL REFERENCE BUILD (LOCKER)
     <touch file="${build-locker.dir}/all.complete" verbose="no"/>
     <path id="locker.classpath">
       <pathelement location="${build-locker.dir}/classes/library"/>
+      <pathelement location="${lib.dir}/forkjoin.jar"/>
       <pathelement location="${build-locker.dir}/classes/compiler"/>
       <pathelement location="${lib.dir}/fjbg.jar"/>
       <pathelement location="${lib.dir}/msil.jar"/>
@@ -465,6 +468,7 @@ QUICK BUILD (QUICK)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
+        <pathelement location="${lib.dir}/forkjoin.jar"/>
       </compilationpath>
     </scalacfork>
     <scalacfork
@@ -507,12 +511,14 @@ QUICK BUILD (QUICK)
   
   <target name="quick.newlibs" depends="quick.lib" if="libs.outdated">
     <antcall target="libs.done">
+      <param name="forkjoin.jar" value="${build-libs.dir}/forkjoin.jar"/>
       <param name="fjbg.jar" value="${build-libs.dir}/fjbg.jar"/>
       <param name="msil.jar" value="${build-libs.dir}/msil.jar"/>
     </antcall>
   </target>
   
   <target name="quick.libs" depends="quick.newlibs" unless="libs.outdated">
+    <property name="forkjoin.jar" value="${lib.dir}/forkjoin.jar"/>
     <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/>
     <property name="msil.jar" value="${lib.dir}/msil.jar"/>
   </target>
@@ -535,6 +541,7 @@ QUICK BUILD (QUICK)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
+        <pathelement location="${forkjoin.jar}"/>
         <pathelement location="${build-quick.dir}/classes/compiler"/>
         <pathelement location="${fjbg.jar}"/>
         <pathelement location="${msil.jar}"/>
@@ -648,6 +655,7 @@ QUICK BUILD (QUICK)
   <target name="quick.bin" depends="quick.pre-bin" unless="quick.bin.available">
     <path id="quick.bin.classpath">
       <pathelement location="${build-quick.dir}/classes/library"/>
+      <pathelement location="${forkjoin.jar}"/>
       <pathelement location="${build-quick.dir}/classes/compiler"/>
       <pathelement location="${build-quick.dir}/classes/scalap"/>
       <pathelement location="${fjbg.jar}"/>
@@ -692,6 +700,7 @@ QUICK BUILD (QUICK)
   <target name="quick.done" depends="quick.bin">
     <path id="quick.classpath">
       <pathelement location="${build-quick.dir}/classes/library"/>
+      <pathelement location="${forkjoin.jar}"/>
       <pathelement location="${build-quick.dir}/classes/compiler"/>
       <pathelement location="${fjbg.jar}"/>
       <pathelement location="${msil.jar}"/>
@@ -723,6 +732,7 @@ PACKED QUICK BUILD (PACK)
         <exclude name="scala/dbc/**"/>
         <exclude name="scala/swing/**"/>
       </fileset>
+      <zipfileset dirmode="755" filemode="644" src="${forkjoin.jar}"/>
     </jar>
     <jar destfile="${build-pack.dir}/lib/scala-dbc.jar">
       <fileset dir="${build-quick.dir}/classes/library">
@@ -909,6 +919,7 @@ BOOTSTRAPPING BUILD (STRAP)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
+        <pathelement location="${forkjoin.jar}"/>
       </compilationpath>
     </scalacfork>
     <scalacfork
@@ -967,6 +978,7 @@ BOOTSTRAPPING BUILD (STRAP)
       <include name="**/*.scala"/>
       <compilationpath>
         <pathelement location="${build-strap.dir}/classes/library"/>
+        <pathelement location="${forkjoin.jar}"/>
         <pathelement location="${build-strap.dir}/classes/compiler"/>
         <pathelement location="${fjbg.jar}"/>
         <pathelement location="${msil.jar}"/>
@@ -1079,6 +1091,38 @@ LIBRARIES (MSIL, FJBG maybe later)
   
   <target name="libs.start"/>
   
+  <target name="libs.pre-forkjoin" depends="libs.start">
+    <uptodate property="libs.forkjoin.available" targetfile="${build-libs.dir}/forkjoin.complete">
+      <srcfiles dir="${src.dir}/forkjoin">
+        <include name="**/*.java"/>
+        <include name="**/*.scala"/>
+      </srcfiles>
+    </uptodate>
+  </target>
+  
+  <target name="libs.forkjoin" depends="libs.pre-forkjoin" unless="libs.forkjoin.available">
+    <mkdir dir="${build-libs.dir}/classes/forkjoin"/>
+    <javac
+      srcdir="${src.dir}/forkjoin"
+      destdir="${build-libs.dir}/classes/forkjoin"
+      classpath="${build-libs.dir}/classes/forkjoin"
+      includes="**/*.java"
+      debug="true"
+      target="1.5" source="1.5">
+        <compilerarg line="${javac.args}"/>
+    </javac>
+    <touch file="${build-libs.dir}/forkjoin.complete" verbose="no"/>
+  </target>
+  
+  <target name="libs.pre-forkjoinpack" depends="libs.forkjoin">
+  </target>
+  
+  <target name="libs.forkjoinpack" depends="libs.pre-forkjoinpack" unless="libs.forkjoinpack.available">
+    <jar destfile="${build-libs.dir}/forkjoin.jar">
+      <fileset dir="${build-libs.dir}/classes/forkjoin"/>
+    </jar>
+  </target>
+  
   <target name="libs.pre-msil" depends="libs.start">
     <uptodate property="libs.msil.available" targetfile="${build-libs.dir}/msil.complete">
       <srcfiles dir="${src.dir}/msil">
@@ -1143,20 +1187,6 @@ LIBRARIES (MSIL, FJBG maybe later)
       target="1.5" source="1.4">
         <compilerarg line="${javac.args}"/>
     </javac>
-    <!-- For now, JFBG is written in pure Java
-    <scalacfork
-      destdir="${build-libs.dir}/classes/fjbg"
-      compilerpathref="locker.classpath"
-      params="${scalac.args.all}"
-      srcdir="${src.dir}/fjbg"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath>
-        <pathelement location="${build-quick.dir}/classes/library"/>
-        <pathelement location="${build-libs.dir}/classes/fjbg"/>
-      </compilationpath>
-    </scalacfork>
-    -->
     <touch file="${build-libs.dir}/fjbg.complete" verbose="no"/>
   </target>
   
@@ -1169,7 +1199,7 @@ LIBRARIES (MSIL, FJBG maybe later)
     </jar>
   </target>
   
-  <target name="libs.done" depends="libs.msilpack, libs.fjbgpack"/>
+  <target name="libs.done" depends="libs.msilpack, libs.fjbgpack, libs.forkjoinpack"/>
 
   <target name="libs.clean" depends="pack.clean">
     <delete dir="${build-libs.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
@@ -1472,29 +1502,30 @@ STABLE REFERENCE (STARR)
   </target>
 
   <target name="starr.lib" depends="starr.start">
-    <copy file="${basedir}/build/pack/lib/scala-library.jar"
-          toFile="${basedir}/lib/scala-library.jar"
-          overwrite="yes"/>
+    <jar destfile="${basedir}/lib/scala-library.jar">
+      <fileset dir="${basedir}/build/quick/classes/library"/>
+    </jar>
   </target>
 
   <target name="starr.comp" depends="starr.lib">
-    <delete file="${basedir}/lib/scala-compiler.jar"/>
     <jar destfile="${basedir}/lib/scala-compiler.jar">
       <fileset dir="${basedir}/build/quick/classes/compiler"/>
     </jar>
   </target>
 
   <target name="starr.src" depends="starr.comp">
-    <delete file="${basedir}/lib/scala-library-src.jar"/>
     <jar destfile="${basedir}/lib/scala-library-src.jar">
       <fileset dir="${basedir}/src/library"/>
       <fileset dir="${basedir}/src/actors"/>
+      <fileset dir="${basedir}/src/swing"/>
+      <fileset dir="${basedir}/src/dbc"/>
     </jar>
   </target>
 
   <target name="starr.libs" depends="starr.src" if="libs.outdated">
     <copy toDir="${lib.dir}" overwrite="yes">
       <fileset dir="${build-libs.dir}">
+        <include name="forkjoin.jar"/>
         <include name="fjbg.jar"/>
         <include name="msil.jar"/>
       </fileset>