Skip to content

Commit 236ee08

Browse files
committed
Merge pull request scala#4466 from lrytz/2.12-milestone
Prepare for the 2.12.0-M1 release
2 parents a231f7d + 7b54922 commit 236ee08

File tree

218 files changed

+178
-21017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+178
-21017
lines changed

build-ant-macros.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<attribute name="stage"/>
127127
<!-- current stage (locker, quick, strap) -->
128128
<attribute name="project"/>
129-
<!-- project: library/reflect/compiler/actors -->
129+
<!-- project: library/reflect/compiler -->
130130
<attribute name="destproject" default="@{project}"/>
131131
<!-- overrides the output directory; used when building multiple projects into the same directory-->
132132
<attribute name="args" default=""/>
@@ -193,7 +193,7 @@
193193
<attribute name="stage"/>
194194
<!-- current stage (locker, quick, strap) -->
195195
<attribute name="project"/>
196-
<!-- project: library/reflect/compiler/actors -->
196+
<!-- project: library/reflect/compiler -->
197197
<attribute name="srcpath" default="NOT SET"/>
198198
<!-- needed to compile the library -->
199199
<attribute name="args" default=""/>
@@ -262,7 +262,7 @@
262262
<attribute name="stage"/>
263263
<!-- current stage (locker, quick, strap) -->
264264
<attribute name="project"/>
265-
<!-- project: library/reflect/compiler/actors -->
265+
<!-- project: library/reflect/compiler -->
266266
<attribute name="srcpath" default="NOT SET"/>
267267
<!-- needed to compile the library -->
268268
<attribute name="args" default=""/>
@@ -469,9 +469,7 @@
469469
<filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}"/>
470470
<filter token="XML_VERSION" value="${scala-xml.version.number}" />
471471
<filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
472-
<filter token="CONTINUATIONS_PLUGIN_VERSION" value="${scala-continuations-plugin.version.number}" />
473-
<filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
474-
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
472+
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
475473
</filterset>
476474
</copy>
477475
<bnd classpath="${@{project}.jar}" eclipse="false" failok="false" exceptions="true" files="${build-osgi.dir}/${@{project}.name}.bnd" output="${build-osgi.dir}"/>
@@ -595,14 +593,11 @@
595593
<filter token="SCALA_FULL_VERSION" value="${scala.full.version}" />
596594
<filter token="XML_VERSION" value="${scala-xml.version.number}" />
597595
<filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
598-
<filter token="CONTINUATIONS_PLUGIN_VERSION" value="${scala-continuations-plugin.version.number}" />
599-
<filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
600-
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
596+
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
601597
<filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" />
602598
<filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
603599
<filter token="JLINE_VERSION" value="${jline.version}" />
604600
<filter token="AKKA_ACTOR_VERSION" value="${akka-actor.version.number}" />
605-
<filter token="ACTORS_MIGRATION_VERSION" value="${actors-migration.version.number}" />
606601

607602
<!-- TODO modularize compiler.
608603
<filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}" />
@@ -741,7 +736,6 @@
741736
<deploy-one name="scala-compiler-interactive" local="@{local}" signed="@{signed}"/>
742737
-->
743738

744-
<deploy-one name="scala-actors" local="@{local}" signed="@{signed}"/>
745739
<deploy-one name="scalap" local="@{local}" signed="@{signed}"/>
746740
</sequential>
747741
</macrodef>

build.number

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
#Tue Sep 11 19:21:09 CEST 2007
1+
# The version number in this file should be the next un-released minor version,
2+
# e.g., 2.11.7, 2.12.0, 2.12.1. It's used to determine version numbers for
3+
# SNAPSHOT / nightly builds and local builds of source checkouts.
4+
25
version.major=2
36
version.minor=12
47
version.patch=0
5-
# This is the -N part of a version. if it's 0, it's dropped from maven versions.
8+
9+
# This is the -N part of a version (2.9.1-1). If it's 0, it's dropped from maven versions. It should not be used again.
610
version.bnum=0
711

812
# To build a release, see scripts/jobs/scala-release-2.11.x-build
9-
# (normally run by the eponymous job on scala-ci.typesafe.com).
13+
# (normally run by the eponymous job on scala-ci.typesafe.com).

build.xml

Lines changed: 7 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ TODO:
7575
<target name="nightly"><optimized name="all.done"/></target>
7676
<target name="nightly.checkall"> <antcall target="all.done"> <param name="partest.scalac_opts" value="-Ycheck:all"/></antcall></target>
7777

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).">
8080
<antcall target="publish">
8181
<param name="docs.skip" value="1"/>
8282
<param name="scalac.args.optimise" value="-optimise"/>
@@ -311,9 +311,6 @@ TODO:
311311
necessary cross suffix (usually something like "_2.11.0-M6". -->
312312
<prepareCross name="scala-xml" />
313313
<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"/>
317314
<prepareCross name="scala-swing"/>
318315
<prepareCross name="partest"/>
319316
<prepareCross name="scalacheck"/>
@@ -347,8 +344,6 @@ TODO:
347344
<artifact:remoteRepository refid="extra-repo"/>
348345
<dependency groupId="org.scala-lang.modules" artifactId="scala-xml${scala-xml.cross}" version="${scala-xml.version.number}"/>
349346
<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}"/>
352347
<dependency groupId="org.scala-lang.modules" artifactId="scala-swing${scala-swing.cross}" version="${scala-swing.version.number}"/>
353348
</artifact:dependencies>
354349

@@ -367,8 +362,6 @@ TODO:
367362

368363
<propertyForCrossedArtifact name="scala-parser-combinators" jar="org.scala-lang.modules:scala-parser-combinators"/>
369364
<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"/>
372365
<propertyForCrossedArtifact name="scala-swing" jar="org.scala-lang.modules:scala-swing"/>
373366

374367
<!-- BND support -->
@@ -559,29 +552,21 @@ TODO:
559552
<echo message="Updating `versions.properties`:"/>
560553
<echo message="starr.version = ${starr.version}"/>
561554
<echo message="scala.binary.version = ${scala.binary.version}"/>
562-
<echo message="scala.full.version = ${scala.full.version}"/>
563555
<echo message="scala-xml.version.number = ${scala-xml.version.number}"/>
564556
<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}"/>
567557
<echo message="scala-swing.version.number = ${scala-swing.version.number}"/>
568558
<echo message="akka-actor.version.number = ${akka-actor.version.number}"/>
569-
<echo message="actors-migration.version.number = ${actors-migration.version.number}"/>
570559
<echo message="jline.version = ${jline.version}"/>
571560
<echo message="partest.version.number = ${partest.version.number}"/>
572561
<echo message="scalacheck.version.number = ${scalacheck.version.number}"/>
573562

574563
<propertyfile file="versions.properties">
575564
<entry key="starr.version" value="${starr.version}"/>
576565
<entry key="scala.binary.version" value="${scala.binary.version}"/>
577-
<entry key="scala.full.version" value="${scala.full.version}"/>
578566
<entry key="scala-xml.version.number" value="${scala-xml.version.number}"/>
579567
<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}"/>
582568
<entry key="scala-swing.version.number" value="${scala-swing.version.number}"/>
583569
<entry key="akka-actor.version.number" value="${akka-actor.version.number}"/>
584-
<entry key="actors-migration.version.number" value="${actors-migration.version.number}"/>
585570
<entry key="jline.version" value="${jline.version}"/>
586571
<entry key="partest.version.number" value="${partest.version.number}"/>
587572
<entry key="scalacheck.version.number" value="${scalacheck.version.number}"/>
@@ -619,26 +604,12 @@ TODO:
619604
<property name="scaladoc.version" value="${scala-compiler-doc.version.number}"/>
620605
<property name="scaladoc.targetjar" value="scala-compiler-doc_${scala.binary.version}-${scala-compiler-doc.version.number}.jar"/>
621606

622-
<property name="actors.description" value="Scala Actors Library"/>
623-
624607
<property name="swing.description" value="Scala Swing Library"/>
625608
<property name="swing.package" value="modules."/>
626609
<property name="swing.jar" value="${scala-swing}"/>
627610
<property name="swing.src" value="false"/>
628611
<property name="swing.srcjar" value="${scala-swing-sources}"/>
629612

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-
642613
<property name="parser-combinators.description" value="Scala Parser Combinators Library"/>
643614
<property name="parser-combinators.package" value="modules."/>
644615
<property name="parser-combinators.jar" value="${scala-parser-combinators}"/>
@@ -659,7 +630,7 @@ TODO:
659630
<property name="partest-javaagent.description" value="Scala Compiler Testing Tool (compiler-specific java agent)"/>
660631

661632
<!-- 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">
663634
<sequential>
664635
<!-- description is mandatory -->
665636
<init-project-prop project="@{project}" name="package" default=""/> <!-- used by mvn-package, copy-bundle, make-bundle -->
@@ -708,7 +679,7 @@ TODO:
708679
There must be a variable of the shape @{stage}.@{project}.build.path
709680
for all @{stage} in locker, quick, strap
710681
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
712683
713684
NOTE: interactive, scaladoc, are only used upto quick; they are still packed into the compiler jar
714685
-->
@@ -741,11 +712,6 @@ TODO:
741712
<path refid="aux.libs"/>
742713
</path>
743714

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-
749715
<path id="quick.reflect.build.path">
750716
<path refid="quick.library.build.path"/>
751717
<pathelement location="${build-quick.dir}/classes/reflect"/>
@@ -795,7 +761,6 @@ TODO:
795761

796762
<path id="quick.bin.tool.path">
797763
<path refid="quick.repl.build.path"/>
798-
<path refid="quick.actors.build.path"/>
799764
<pathelement location="${build-quick.dir}/classes/scalap"/>
800765
<pathelement location="${build-quick.dir}/classes/scaladoc"/>
801766
<path refid="external-modules-nocore"/>
@@ -815,7 +780,6 @@ TODO:
815780
<pathelement location="${library.jar}"/>
816781
<pathelement location="${xml.jar}"/>
817782
<pathelement location="${parser-combinators.jar}"/>
818-
<pathelement location="${actors.jar}"/>
819783
<pathelement location="${reflect.jar}"/>
820784
<pathelement location="${compiler.jar}"/>
821785
<!-- TODO modularize compiler: <pathelement location="${scaladoc.jar}"/> -->
@@ -829,10 +793,6 @@ TODO:
829793
<fileset dir="${forkjoin-classes}"/>
830794
</path>
831795

832-
<path id="pack.actors.files">
833-
<fileset dir="${build-quick.dir}/classes/actors"/>
834-
</path>
835-
836796
<path id="pack.compiler.files">
837797
<fileset dir="${build-quick.dir}/classes/compiler"/>
838798

@@ -879,7 +839,6 @@ TODO:
879839
<path id="docs.scaladoc.build.path"> <path refid="quick.scaladoc.build.path"/> </path>
880840
<path id="docs.interactive.build.path"> <path refid="quick.interactive.build.path"/> </path>
881841
<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>
883842

884843
<!-- run-time classpath for scaladoc TODO: resolve through maven -->
885844
<path id="scaladoc.classpath">
@@ -935,9 +894,8 @@ TODO:
935894
<pathelement location="${interactive.jar}"/>
936895
-->
937896

938-
<!-- TODO: move scalap & actors out of repo -->
897+
<!-- TODO: move scalap out of repo -->
939898
<pathelement location="${scalap.jar}"/>
940-
<pathelement location="${actors.jar}"/>
941899

942900
<!-- partest's dependencies, which marks most of its dependencies as provided,
943901
(but not scala-library, so we filter that one out...)
@@ -960,7 +918,6 @@ TODO:
960918
<rsel:name name="scala-library*.jar"/>
961919
<rsel:name name="scala-compiler*.jar"/>
962920
<rsel:name name="scala-reflect*.jar"/>
963-
<rsel:name name="scala-actors*.jar"/>
964921
<rsel:name name="scala-parser-combinators*.jar"/>
965922
<rsel:name name="scala-xml*.jar"/>
966923
</rsel:or></rsel:not>
@@ -988,7 +945,6 @@ TODO:
988945
<pathelement location="${build-osgi.dir}/org.scala-lang.scala-library.jar"/>
989946
<pathelement location="${build-osgi.dir}/org.scala-lang.scala-reflect.jar"/>
990947
<pathelement location="${build-osgi.dir}/org.scala-lang.scala-compiler.jar"/>
991-
<pathelement location="${build-osgi.dir}/org.scala-lang.scala-actors.jar"/>
992948
<path refid="pax.exam.classpath"/>
993949
<path refid="forkjoin.classpath"/>
994950
</path>
@@ -1128,9 +1084,6 @@ TODO:
11281084
<target name="quick.scalap" depends="quick.repl">
11291085
<staged-build with="locker" stage="quick" project="scalap"/> </target>
11301086

1131-
<target name="quick.actors" depends="quick.lib">
1132-
<staged-build with="locker" stage="quick" project="actors"/> </target>
1133-
11341087

11351088

11361089
<target name="quick.modules" depends="quick.repl, quick.scaladoc, quick.interactive, quick.scalap"/>
@@ -1182,14 +1135,12 @@ TODO:
11821135
<target name="pack.interactive" depends="quick.interactive"> <staged-pack project="interactive"/> </target>
11831136
-->
11841137

1185-
<target name="pack.actors" depends="quick.actors"> <staged-pack project="actors"/> </target>
1186-
11871138
<target name="pack.scalap" depends="quick.scalap"> <staged-pack project="scalap"/> </target>
11881139

11891140
<target name="pack.core" depends="pack.reflect, pack.comp, pack.lib"/>
11901141

11911142
<!-- 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">
11931144
<copy todir="${build-pack.dir}/lib">
11941145
<path refid="external-modules-nocore" />
11951146
<mapper type="flatten" />
@@ -1295,10 +1246,6 @@ TODO:
12951246
<include name="${scaladoc.jar}"/>
12961247
-->
12971248

1298-
<file name="${actors.jar}"/>
1299-
1300-
<file name="${continuations-plugin.jar}"/>
1301-
<file name="${continuations-library.jar}"/>
13021249
<file name="${parser-combinators.jar}"/>
13031250
<file name="${xml.jar}"/>
13041251
<file name="${swing.jar}"/>
@@ -1323,13 +1270,6 @@ TODO:
13231270
</make-bundle>
13241271
-->
13251272

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"/>
13331273
<make-bundle project="parser-combinators"/>
13341274
<make-bundle project="xml"/>
13351275
<make-bundle project="swing"/>
@@ -1640,12 +1580,6 @@ TODO:
16401580
</target>
16411581
-->
16421582

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-
16491583
<target name="docs.scalap" depends="docs.start" unless="docs.skip">
16501584
<staged-docs project="scalap">
16511585
<include name="**/*.scala"/>
@@ -1654,7 +1588,7 @@ TODO:
16541588

16551589
<target name="docs.core" depends="docs.lib, docs.reflect, docs.comp" unless="docs.skip"/>
16561590
<!-- 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"/>
16581592

16591593
<!-- doc/ and man/ -->
16601594
<target name="pack.doc" depends="scaladoc.task" unless="docs.skip"> <!-- depends on scaladoc.task for scalac taskdef -->
@@ -1729,8 +1663,6 @@ MAIN DISTRIBUTION PACKAGING
17291663
<mvn-package project="scaladoc"/>
17301664
-->
17311665

1732-
<mvn-package project="actors"/>
1733-
17341666
<!-- don't bother fitting scalap into the mould: it will move out soon -->
17351667
<copy tofile="${dist.maven}/scalap/scalap-pom.xml" file="${src.dir}/build/maven/scalap-pom.xml" overwrite="true"/>
17361668
<copy tofile="${dist.maven}/scalap/scalap.jar" file="${scalap.jar}" overwrite="true"/>

0 commit comments

Comments
 (0)