75
75
<target name =" nightly" > <optimized name =" all.done" /></target >
76
76
<target name =" nightly.checkall" > <antcall target =" all.done" > <param name =" partest.scalac_opts" value =" -Ycheck:all" /></antcall ></target >
77
77
78
- <!-- The IDE build requires actors/ swing/continuations , so need to publish them during PR validation until they are modules -->
79
- <target name =" publish-opt-nodocs" description =" Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/actors/ swing/continuations )." >
78
+ <!-- The IDE build requires swing, so need to publish them during PR validation until they are modules -->
79
+ <target name =" publish-opt-nodocs" description =" Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/swing)." >
80
80
<antcall target =" publish" >
81
81
<param name =" docs.skip" value =" 1" />
82
82
<param name =" scalac.args.optimise" value =" -optimise" />
@@ -311,9 +311,6 @@ TODO:
311
311
necessary cross suffix (usually something like "_2.11.0-M6". -->
312
312
<prepareCross name =" scala-xml" />
313
313
<prepareCross name =" scala-parser-combinators" />
314
- <property name =" scala-continuations-plugin.cross.suffix" value =" _${ scala.full.version } " />
315
- <prepareCross name =" scala-continuations-plugin" />
316
- <prepareCross name =" scala-continuations-library" />
317
314
<prepareCross name =" scala-swing" />
318
315
<prepareCross name =" partest" />
319
316
<prepareCross name =" scalacheck" />
@@ -347,8 +344,6 @@ TODO:
347
344
<artifact : remoteRepository refid =" extra-repo" />
348
345
<dependency groupId =" org.scala-lang.modules" artifactId =" scala-xml${ scala-xml.cross } " version =" ${ scala-xml.version.number } " />
349
346
<dependency groupId =" org.scala-lang.modules" artifactId =" scala-parser-combinators${ scala-parser-combinators.cross } " version =" ${ scala-parser-combinators.version.number } " />
350
- <dependency groupId =" org.scala-lang.plugins" artifactId =" scala-continuations-plugin${ scala-continuations-plugin.cross } " version =" ${ scala-continuations-plugin.version.number } " />
351
- <dependency groupId =" org.scala-lang.plugins" artifactId =" scala-continuations-library${ scala-continuations-library.cross } " version =" ${ scala-continuations-library.version.number } " />
352
347
<dependency groupId =" org.scala-lang.modules" artifactId =" scala-swing${ scala-swing.cross } " version =" ${ scala-swing.version.number } " />
353
348
</artifact : dependencies >
354
349
@@ -367,8 +362,6 @@ TODO:
367
362
368
363
<propertyForCrossedArtifact name =" scala-parser-combinators" jar =" org.scala-lang.modules:scala-parser-combinators" />
369
364
<propertyForCrossedArtifact name =" scala-xml" jar =" org.scala-lang.modules:scala-xml" />
370
- <propertyForCrossedArtifact name =" scala-continuations-plugin" jar =" org.scala-lang.plugins:scala-continuations-plugin" />
371
- <propertyForCrossedArtifact name =" scala-continuations-library" jar =" org.scala-lang.plugins:scala-continuations-library" />
372
365
<propertyForCrossedArtifact name =" scala-swing" jar =" org.scala-lang.modules:scala-swing" />
373
366
374
367
<!-- BND support -->
@@ -559,29 +552,21 @@ TODO:
559
552
<echo message =" Updating `versions.properties`:" />
560
553
<echo message =" starr.version = ${ starr.version } " />
561
554
<echo message =" scala.binary.version = ${ scala.binary.version } " />
562
- <echo message =" scala.full.version = ${ scala.full.version } " />
563
555
<echo message =" scala-xml.version.number = ${ scala-xml.version.number } " />
564
556
<echo message =" scala-parser-combinators.version.number = ${ scala-parser-combinators.version.number } " />
565
- <echo message =" scala-continuations-plugin.version.number = ${ scala-continuations-plugin.version.number } " />
566
- <echo message =" scala-continuations-library.version.number = ${ scala-continuations-library.version.number } " />
567
557
<echo message =" scala-swing.version.number = ${ scala-swing.version.number } " />
568
558
<echo message =" akka-actor.version.number = ${ akka-actor.version.number } " />
569
- <echo message =" actors-migration.version.number = ${ actors-migration.version.number } " />
570
559
<echo message =" jline.version = ${ jline.version } " />
571
560
<echo message =" partest.version.number = ${ partest.version.number } " />
572
561
<echo message =" scalacheck.version.number = ${ scalacheck.version.number } " />
573
562
574
563
<propertyfile file =" versions.properties" >
575
564
<entry key =" starr.version" value =" ${ starr.version } " />
576
565
<entry key =" scala.binary.version" value =" ${ scala.binary.version } " />
577
- <entry key =" scala.full.version" value =" ${ scala.full.version } " />
578
566
<entry key =" scala-xml.version.number" value =" ${ scala-xml.version.number } " />
579
567
<entry key =" scala-parser-combinators.version.number" value =" ${ scala-parser-combinators.version.number } " />
580
- <entry key =" scala-continuations-plugin.version.number" value =" ${ scala-continuations-plugin.version.number } " />
581
- <entry key =" scala-continuations-library.version.number" value =" ${ scala-continuations-library.version.number } " />
582
568
<entry key =" scala-swing.version.number" value =" ${ scala-swing.version.number } " />
583
569
<entry key =" akka-actor.version.number" value =" ${ akka-actor.version.number } " />
584
- <entry key =" actors-migration.version.number" value =" ${ actors-migration.version.number } " />
585
570
<entry key =" jline.version" value =" ${ jline.version } " />
586
571
<entry key =" partest.version.number" value =" ${ partest.version.number } " />
587
572
<entry key =" scalacheck.version.number" value =" ${ scalacheck.version.number } " />
@@ -619,26 +604,12 @@ TODO:
619
604
<property name =" scaladoc.version" value =" ${ scala-compiler-doc.version.number } " />
620
605
<property name =" scaladoc.targetjar" value =" scala-compiler-doc_${ scala.binary.version } -${ scala-compiler-doc.version.number } .jar" />
621
606
622
- <property name =" actors.description" value =" Scala Actors Library" />
623
-
624
607
<property name =" swing.description" value =" Scala Swing Library" />
625
608
<property name =" swing.package" value =" modules." />
626
609
<property name =" swing.jar" value =" ${ scala-swing } " />
627
610
<property name =" swing.src" value =" false" />
628
611
<property name =" swing.srcjar" value =" ${ scala-swing-sources } " />
629
612
630
- <property name =" continuations-plugin.description" value =" Scala Delimited Continuations Compiler Plugin" />
631
- <property name =" continuations-plugin.package" value =" plugins." />
632
- <property name =" continuations-plugin.jar" value =" ${ scala-continuations-plugin } " />
633
- <property name =" continuations-plugin.src" value =" false" />
634
- <property name =" continuations-plugin.srcjar" value =" ${ scala-continuations-plugin-sources } " />
635
-
636
- <property name =" continuations-library.description" value =" Scala Delimited Continuations Library" />
637
- <property name =" continuations-library.package" value =" plugins." />
638
- <property name =" continuations-library.jar" value =" ${ scala-continuations-library } " />
639
- <property name =" continuations-library.src" value =" false" />
640
- <property name =" continuations-library.srcjar" value =" ${ scala-continuations-library-sources } " />
641
-
642
613
<property name =" parser-combinators.description" value =" Scala Parser Combinators Library" />
643
614
<property name =" parser-combinators.package" value =" modules." />
644
615
<property name =" parser-combinators.jar" value =" ${ scala-parser-combinators } " />
@@ -659,7 +630,7 @@ TODO:
659
630
<property name =" partest-javaagent.description" value =" Scala Compiler Testing Tool (compiler-specific java agent)" />
660
631
661
632
<!-- projects without project-specific options: asm, forkjoin, manual, bin, repl -->
662
- <for list =" actors, compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml,continuations-plugin,continuations-library " param =" project" >
633
+ <for list =" compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml" param =" project" >
663
634
<sequential >
664
635
<!-- description is mandatory -->
665
636
<init-project-prop project =" @{ project } " name =" package" default =" " /> <!-- used by mvn-package, copy-bundle, make-bundle -->
@@ -708,7 +679,7 @@ TODO:
708
679
There must be a variable of the shape @{stage}.@{project}.build.path
709
680
for all @{stage} in locker, quick, strap
710
681
and all @{project} in library, reflect, compiler
711
- when stage is quick, @{project} also includes: actors, repl, scalap
682
+ when stage is quick, @{project} also includes: repl, scalap
712
683
713
684
NOTE: interactive, scaladoc, are only used upto quick; they are still packed into the compiler jar
714
685
-->
@@ -741,11 +712,6 @@ TODO:
741
712
<path refid =" aux.libs" />
742
713
</path >
743
714
744
- <path id =" quick.actors.build.path" >
745
- <path refid =" quick.library.build.path" />
746
- <pathelement location =" ${ build-quick.dir } /classes/actors" />
747
- </path >
748
-
749
715
<path id =" quick.reflect.build.path" >
750
716
<path refid =" quick.library.build.path" />
751
717
<pathelement location =" ${ build-quick.dir } /classes/reflect" />
@@ -795,7 +761,6 @@ TODO:
795
761
796
762
<path id =" quick.bin.tool.path" >
797
763
<path refid =" quick.repl.build.path" />
798
- <path refid =" quick.actors.build.path" />
799
764
<pathelement location =" ${ build-quick.dir } /classes/scalap" />
800
765
<pathelement location =" ${ build-quick.dir } /classes/scaladoc" />
801
766
<path refid =" external-modules-nocore" />
@@ -815,7 +780,6 @@ TODO:
815
780
<pathelement location =" ${ library.jar } " />
816
781
<pathelement location =" ${ xml.jar } " />
817
782
<pathelement location =" ${ parser-combinators.jar } " />
818
- <pathelement location =" ${ actors.jar } " />
819
783
<pathelement location =" ${ reflect.jar } " />
820
784
<pathelement location =" ${ compiler.jar } " />
821
785
<!-- TODO modularize compiler: <pathelement location="${scaladoc.jar}"/> -->
@@ -829,10 +793,6 @@ TODO:
829
793
<fileset dir =" ${ forkjoin-classes } " />
830
794
</path >
831
795
832
- <path id =" pack.actors.files" >
833
- <fileset dir =" ${ build-quick.dir } /classes/actors" />
834
- </path >
835
-
836
796
<path id =" pack.compiler.files" >
837
797
<fileset dir =" ${ build-quick.dir } /classes/compiler" />
838
798
@@ -879,7 +839,6 @@ TODO:
879
839
<path id =" docs.scaladoc.build.path" > <path refid =" quick.scaladoc.build.path" /> </path >
880
840
<path id =" docs.interactive.build.path" > <path refid =" quick.interactive.build.path" /> </path >
881
841
<path id =" docs.scalap.build.path" > <path refid =" quick.scalap.build.path" /> </path >
882
- <path id =" docs.actors.build.path" > <path refid =" quick.actors.build.path" /> </path >
883
842
884
843
<!-- run-time classpath for scaladoc TODO: resolve through maven -->
885
844
<path id =" scaladoc.classpath" >
@@ -935,9 +894,8 @@ TODO:
935
894
<pathelement location="${interactive.jar}"/>
936
895
-->
937
896
938
- <!-- TODO: move scalap & actors out of repo -->
897
+ <!-- TODO: move scalap out of repo -->
939
898
<pathelement location =" ${ scalap.jar } " />
940
- <pathelement location =" ${ actors.jar } " />
941
899
942
900
<!-- partest's dependencies, which marks most of its dependencies as provided,
943
901
(but not scala-library, so we filter that one out...)
@@ -960,7 +918,6 @@ TODO:
960
918
<rsel : name name =" scala-library*.jar" />
961
919
<rsel : name name =" scala-compiler*.jar" />
962
920
<rsel : name name =" scala-reflect*.jar" />
963
- <rsel : name name =" scala-actors*.jar" />
964
921
<rsel : name name =" scala-parser-combinators*.jar" />
965
922
<rsel : name name =" scala-xml*.jar" />
966
923
</rsel : or ></rsel : not >
@@ -988,7 +945,6 @@ TODO:
988
945
<pathelement location =" ${ build-osgi.dir } /org.scala-lang.scala-library.jar" />
989
946
<pathelement location =" ${ build-osgi.dir } /org.scala-lang.scala-reflect.jar" />
990
947
<pathelement location =" ${ build-osgi.dir } /org.scala-lang.scala-compiler.jar" />
991
- <pathelement location =" ${ build-osgi.dir } /org.scala-lang.scala-actors.jar" />
992
948
<path refid =" pax.exam.classpath" />
993
949
<path refid =" forkjoin.classpath" />
994
950
</path >
@@ -1128,9 +1084,6 @@ TODO:
1128
1084
<target name =" quick.scalap" depends =" quick.repl" >
1129
1085
<staged-build with =" locker" stage =" quick" project =" scalap" /> </target >
1130
1086
1131
- <target name =" quick.actors" depends =" quick.lib" >
1132
- <staged-build with =" locker" stage =" quick" project =" actors" /> </target >
1133
-
1134
1087
1135
1088
1136
1089
<target name =" quick.modules" depends =" quick.repl, quick.scaladoc, quick.interactive, quick.scalap" />
@@ -1182,14 +1135,12 @@ TODO:
1182
1135
<target name="pack.interactive" depends="quick.interactive"> <staged-pack project="interactive"/> </target>
1183
1136
-->
1184
1137
1185
- <target name =" pack.actors" depends =" quick.actors" > <staged-pack project =" actors" /> </target >
1186
-
1187
1138
<target name =" pack.scalap" depends =" quick.scalap" > <staged-pack project =" scalap" /> </target >
1188
1139
1189
1140
<target name =" pack.core" depends =" pack.reflect, pack.comp, pack.lib" />
1190
1141
1191
1142
<!-- TODO modularize compiler: pack.scaladoc, pack.interactive, -->
1192
- <target name =" pack.modules" depends =" pack.actors, pack. scalap" >
1143
+ <target name =" pack.modules" depends =" pack.scalap" >
1193
1144
<copy todir =" ${ build-pack.dir } /lib" >
1194
1145
<path refid =" external-modules-nocore" />
1195
1146
<mapper type =" flatten" />
@@ -1295,10 +1246,6 @@ TODO:
1295
1246
<include name="${scaladoc.jar}"/>
1296
1247
-->
1297
1248
1298
- <file name =" ${ actors.jar } " />
1299
-
1300
- <file name =" ${ continuations-plugin.jar } " />
1301
- <file name =" ${ continuations-library.jar } " />
1302
1249
<file name =" ${ parser-combinators.jar } " />
1303
1250
<file name =" ${ xml.jar } " />
1304
1251
<file name =" ${ swing.jar } " />
@@ -1323,13 +1270,6 @@ TODO:
1323
1270
</make-bundle>
1324
1271
-->
1325
1272
1326
- <make-bundle project =" actors" >
1327
- <fileset dir =" ${ src.dir } /actors" />
1328
- </make-bundle >
1329
-
1330
-
1331
- <make-bundle project =" continuations-plugin" />
1332
- <make-bundle project =" continuations-library" />
1333
1273
<make-bundle project =" parser-combinators" />
1334
1274
<make-bundle project =" xml" />
1335
1275
<make-bundle project =" swing" />
@@ -1640,12 +1580,6 @@ TODO:
1640
1580
</target>
1641
1581
-->
1642
1582
1643
- <target name =" docs.actors" depends =" docs.start" unless =" docs.skip" >
1644
- <staged-docs project =" actors" >
1645
- <include name =" **/*.scala" />
1646
- </staged-docs >
1647
- </target >
1648
-
1649
1583
<target name =" docs.scalap" depends =" docs.start" unless =" docs.skip" >
1650
1584
<staged-docs project =" scalap" >
1651
1585
<include name =" **/*.scala" />
@@ -1654,7 +1588,7 @@ TODO:
1654
1588
1655
1589
<target name =" docs.core" depends =" docs.lib, docs.reflect, docs.comp" unless =" docs.skip" />
1656
1590
<!-- TODO modularize compiler: docs.scaladoc, docs.interactive, -->
1657
- <target name =" docs.done" depends =" docs.core, docs.actors, docs. scalap" unless =" docs.skip" />
1591
+ <target name =" docs.done" depends =" docs.core, docs.scalap" unless =" docs.skip" />
1658
1592
1659
1593
<!-- doc/ and man/ -->
1660
1594
<target name =" pack.doc" depends =" scaladoc.task" unless =" docs.skip" > <!-- depends on scaladoc.task for scalac taskdef -->
@@ -1729,8 +1663,6 @@ MAIN DISTRIBUTION PACKAGING
1729
1663
<mvn-package project="scaladoc"/>
1730
1664
-->
1731
1665
1732
- <mvn-package project =" actors" />
1733
-
1734
1666
<!-- don't bother fitting scalap into the mould: it will move out soon -->
1735
1667
<copy tofile =" ${ dist.maven } /scalap/scalap-pom.xml" file =" ${ src.dir } /build/maven/scalap-pom.xml" overwrite =" true" />
1736
1668
<copy tofile =" ${ dist.maven } /scalap/scalap.jar" file =" ${ scalap.jar } " overwrite =" true" />
0 commit comments