Skip to content

Commit b48ecfc

Browse files
committed
Render scala.full.version to versions.properties.
When called with -Dupdate.versions, the build will render its current set of versions to versions properties. This is used during releases, when bootstrapping to a consistent set of modules that constitute a release. Particularly, scala.full.version is the non-SNAPSHOT full version of scala that's closed to maven.version.number. It's similar in spirit to the module build's snapshotScalaBinaryVersion, except that it's always the full version, so, e.g., 2.11.1 rather than 2.11. This version is so far only used to determine the dependency on scala-continuations-plugin in scala-dist.
1 parent 470a512 commit b48ecfc

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

build.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ TODO:
550550
<echo message="Updating `versions.properties`:"/>
551551
<echo message="starr.version = ${starr.version}"/>
552552
<echo message="scala.binary.version = ${scala.binary.version}"/>
553+
<echo message="scala.full.version = ${scala.full.version}"/>
553554
<echo message="scala-xml.version.number = ${scala-xml.version.number}"/>
554555
<echo message="scala-parser-combinators.version.number = ${scala-parser-combinators.version.number}"/>
555556
<echo message="scala-continuations-plugin.version.number = ${scala-continuations-plugin.version.number}"/>
@@ -563,6 +564,7 @@ TODO:
563564
<propertyfile file="versions.properties">
564565
<entry key="starr.version" value="${starr.version}"/>
565566
<entry key="scala.binary.version" value="${scala.binary.version}"/>
567+
<entry key="scala.full.version" value="${scala.full.version}"/>
566568
<entry key="scala-xml.version.number" value="${scala-xml.version.number}"/>
567569
<entry key="scala-parser-combinators.version.number" value="${scala-parser-combinators.version.number}"/>
568570
<entry key="scala-continuations-plugin.version.number" value="${scala-continuations-plugin.version.number}"/>

versions.properties

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
#Wed, 19 Mar 2014 03:05:28 +0100
2+
# NOTE: this file determines the content of the scala-distribution
3+
# via scala-dist-pom.xml and scala-library-all-pom.xml
4+
# when adding new properties that influence a release,
5+
# also add them to the update.versions mechanism in build.xml,
6+
# which is used by scala-release-2.11.x in scala/jenkins-scripts
27
starr.version=2.11.0-RC3
38
starr.use.released=1
49

@@ -8,16 +13,15 @@ starr.use.released=1
813
# e.g. 2.11.0-RC1, 2.11
914
scala.binary.version=2.11.0-RC3
1015
# e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1
16+
# this defines the dependency on scala-continuations-plugin in scala-dist's pom
1117
scala.full.version=2.11.0-RC3
1218

13-
# external modules shipped with distribution:
19+
# external modules shipped with distribution, as specified by scala-library-all's pom
1420
scala-xml.version.number=1.0.1
1521
scala-parser-combinators.version.number=1.0.1
1622
scala-continuations-plugin.version.number=1.0.1
1723
scala-continuations-library.version.number=1.0.1
1824
scala-swing.version.number=1.0.1
19-
20-
# these ship with distribution (and scala-library-all depends on them)
2125
akka-actor.version.number=2.3.0
2226
actors-migration.version.number=1.1.0
2327

0 commit comments

Comments
 (0)