@@ -165,7 +165,6 @@ TODO:
165
165
<property name =" build.dir" value =" ${ basedir } /build" />
166
166
<property name =" build-deps.dir" value =" ${ build.dir } /deps" />
167
167
<property name =" build-libs.dir" value =" ${ build.dir } /libs" />
168
- <property name =" build-forkjoin.dir" value =" ${ build-libs.dir } " />
169
168
<property name =" build-locker.dir" value =" ${ build.dir } /locker" />
170
169
<property name =" build-quick.dir" value =" ${ build.dir } /quick" />
171
170
<property name =" build-pack.dir" value =" ${ build.dir } /pack" />
@@ -570,9 +569,6 @@ TODO:
570
569
</propertyfile >
571
570
</then ></if >
572
571
573
- <path id =" forkjoin.classpath" path =" ${ build-forkjoin.dir } /classes/forkjoin" />
574
- <property name =" forkjoin-classes" refid =" forkjoin.classpath" />
575
-
576
572
<!-- the following properties fully define staged-docs, staged-pack, make-bundle, copy-bundle and mvn-package for each of the projects -->
577
573
<property name =" library.description" value =" Scala Standard Library" />
578
574
<property name =" library.docroot" value =" rootdoc.txt" />
@@ -627,7 +623,7 @@ TODO:
627
623
<property name =" partest-extras.description" value =" Scala Compiler Testing Tool (compiler-specific extras)" />
628
624
<property name =" partest-javaagent.description" value =" Scala Compiler Testing Tool (compiler-specific java agent)" />
629
625
630
- <!-- projects without project-specific options: forkjoin, manual, bin, repl -->
626
+ <!-- projects without project-specific options: manual, bin, repl -->
631
627
<for list =" compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml,repl-jline" param =" project" >
632
628
<sequential >
633
629
<!-- description is mandatory -->
@@ -685,7 +681,6 @@ TODO:
685
681
<!-- LOCKER -->
686
682
<path id =" locker.library.build.path" >
687
683
<pathelement location =" ${ build-locker.dir } /classes/library" />
688
- <path refid =" forkjoin.classpath" />
689
684
<path refid =" aux.libs" />
690
685
</path >
691
686
@@ -706,7 +701,6 @@ TODO:
706
701
<!-- QUICK -->
707
702
<path id =" quick.library.build.path" >
708
703
<pathelement location =" ${ build-quick.dir } /classes/library" />
709
- <path refid =" forkjoin.classpath" />
710
704
<path refid =" aux.libs" />
711
705
</path >
712
706
@@ -781,7 +775,6 @@ TODO:
781
775
<pathelement location =" ${ reflect.jar } " />
782
776
<pathelement location =" ${ compiler.jar } " />
783
777
<pathelement location =" ${ ant.jar } " />
784
- <path refid =" forkjoin.classpath" />
785
778
<path refid =" aux.libs" />
786
779
</path >
787
780
@@ -799,7 +792,6 @@ TODO:
799
792
800
793
<path id =" pack.library.files" >
801
794
<fileset dir =" ${ build-quick.dir } /classes/library" />
802
- <fileset dir =" ${ forkjoin-classes } " />
803
795
</path >
804
796
805
797
<path id =" pack.repl-jline.files" > <fileset dir =" ${ build-quick.dir } /classes/repl-jline" /> </path >
@@ -829,7 +821,6 @@ TODO:
829
821
<!-- STRAP -->
830
822
<path id =" strap.library.build.path" >
831
823
<pathelement location =" ${ build-strap.dir } /classes/library" />
832
- <path refid =" forkjoin.classpath" />
833
824
<path refid =" aux.libs" />
834
825
</path >
835
826
@@ -958,7 +949,6 @@ TODO:
958
949
<pathelement location =" ${ build-osgi.dir } /org.scala-lang.scala-reflect.jar" />
959
950
<pathelement location =" ${ build-osgi.dir } /org.scala-lang.scala-compiler.jar" />
960
951
<path refid =" pax.exam.classpath" />
961
- <path refid =" forkjoin.classpath" />
962
952
</path >
963
953
964
954
<path id =" test.osgi.compiler.build.path.felix" >
@@ -1029,8 +1019,6 @@ TODO:
1029
1019
LOCAL DEPENDENCIES
1030
1020
============================================================================ -->
1031
1021
1032
- <target name =" forkjoin.done" depends =" init" > <simple-javac project =" forkjoin" args =" -XDignore.symbol.file" jar =" no" /></target >
1033
-
1034
1022
<!-- For local development only. We only allow released versions of Scala for STARR.
1035
1023
This builds quick (core only) and publishes it with a generated version number,
1036
1024
saving it as starr.version in build.properties, so this compiler will be used as STARR in your next build
@@ -1051,7 +1039,7 @@ TODO:
1051
1039
<!-- ===========================================================================
1052
1040
LOCAL REFERENCE BUILD (LOCKER)
1053
1041
============================================================================ -->
1054
- <target name =" locker.start" depends =" forkjoin.done " >
1042
+ <target name =" locker.start" depends =" init " >
1055
1043
<condition property =" locker.locked" ><available file =" ${ build-locker.dir } /locker.locked" /></condition ></target >
1056
1044
1057
1045
<target name =" locker.lib" depends =" locker.start" unless =" locker.locked" >
@@ -1137,7 +1125,7 @@ TODO:
1137
1125
<!-- ===========================================================================
1138
1126
PACKED QUICK BUILD (PACK)
1139
1127
============================================================================ -->
1140
- <target name =" pack.lib" depends =" quick.lib, forkjoin.done " > <staged-pack project =" library" /></target >
1128
+ <target name =" pack.lib" depends =" quick.lib" > <staged-pack project =" library" /></target >
1141
1129
1142
1130
<target name =" pack.reflect" depends =" quick.reflect" > <staged-pack project =" reflect" /> </target >
1143
1131
0 commit comments