diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-03-02 15:06:55 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-03-02 15:06:58 -0800 |
| commit | b1b7f892e27d98601c7ced3b7f08e08b733dc284 (patch) | |
| tree | 6529a7507d2f535fb211ed08f7fa9ac291c5fb8e /scripts | |
| parent | 6b304a862a515e1b0a9e134645ab3632535166d3 (diff) | |
| download | scala-b1b7f892e27d98601c7ced3b7f08e08b733dc284.tar.gz scala-b1b7f892e27d98601c7ced3b7f08e08b733dc284.tar.bz2 scala-b1b7f892e27d98601c7ced3b7f08e08b733dc284.zip | |
Set scala.full.version during bootstrap,
so that scala-dist depends on the correctly
cross-versioned scala-continuations-plugin.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 46d610018c..d0a5b452a8 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -438,7 +438,6 @@ constructUpdatedModuleVersions() { if [ ! -z "$JLINE_VER" ] ; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Djline.version=$JLINE_VER"); fi if [ ! -z "$SCALA_BINARY_VER" ]; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala.binary.version=$SCALA_BINARY_VER"); fi - if [ ! -z "$SCALA_FULL_VER" ] ; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala.full.version=$SCALA_FULL_VER"); fi } # build locker (scala + modules) and quick, publishing everything to private-repo @@ -493,7 +492,10 @@ bootstrap() { cd $baseDir rm -rf build/ # must leave everything else in $baseDir for downstream jobs + # scala.full.version determines the dependency of scala-dist on the continuations plugin, + # which is fully cross-versioned (for $SCALA_VER, the version we're releasing) ant -Dstarr.version=$SCALA_VER\ + -Dscala.full.version=$SCALA_VER\ -Dextra.repo.url=$privateRepo\ -Dmaven.version.suffix=$SCALA_VER_SUFFIX\ ${updatedModuleVersions[@]} \ |