Permalink
Browse files

Decoupled the Scala library version from the Scala compiler version w…

…hen building the toolchain.

Build the toolchain by using the stable 2.9.1 scala library, and the 2.9.2-SNAPSHOT
compiler.

Cleaned up build profiles and removed obsolete scripts.
  • Loading branch information...
1 parent 5834e4f commit 8c8419f5e9a6187503681bf92c050accfa978f1c Iulian Dragos committed with dragos Nov 6, 2011
@@ -5,6 +5,9 @@
# Scala compiler version to be used as a dependency
SCALA_VERSION=2.8.3-SNAPSHOT
+# Scala library version
+SCALA_LIBRARY_VERSION=2.8.3-SNAPSHOT
+
#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
@@ -5,6 +5,9 @@
# Scala compiler version to be used as a dependency
SCALA_VERSION=2.9.2-SNAPSHOT
+# Scala library version
+SCALA_LIBRARY_VERSION=2.9.1
+
#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
@@ -5,6 +5,9 @@
# Scala compiler version to be used as a dependency
SCALA_VERSION=2.10.0-SNAPSHOT
+# Scala library version
+SCALA_LIBRARY_VERSION=2.10.0-SNAPSHOT
+
# The precompiled compiler-interface.jar that SBT uses to communicate with scalac
# This is usually the same as Scala version, and it is not enough to be just binary
# compatible (compiler interface depends on scalac, not just std library)
@@ -21,10 +21,17 @@ set_version()
build()
{
+ if [ -z $SCALA_LIBRARY_VERSION ]
+ then
+ echo "SCALA_LIBRARY_VERSION is undefined. Please specify a corresponding scala library for the scala compiler version ${SCALA_VERSION}"
+ exit 1
+ fi
+
${MAVEN} \
-U \
$PROFILE \
-Dscala.version=${SCALA_VERSION} \
+ -Dscala.library.version=${SCALA_LIBRARY_VERSION} \
-Dsbt.scala.version=${SBT_SCALA_VERSION} \
-Dsbinary.version=${SBINARY_VERSION} \
-Dscala.precompiled.version=${SCALA_PRECOMPILED} \
@@ -4,14 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.1</version>
+ <version>2.9.2-SNAPSHOT</version>
<name>The Scala Toolchain for Eclipse</name>
<packaging>pom</packaging>
<properties>
<sbt.version>0.11.4</sbt.version>
<patch.level>p0002</patch.level>
<encoding>UTF-8</encoding>
+ <scala.library.version>${scala.version}</scala.library.version>
</properties>
<modules>
@@ -29,17 +30,17 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-swing</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-dbc</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.0-1
-
-build $*
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.0
-
-build $*
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.2-SNAPSHOT
-
-build $*
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.1
-
-build $*
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.1
-
-${MAVEN} \
- -U \
- -P local-scala-2.8.1,!scala-2.8.1 \
- -Dscala.version=${SCALA_VERSION} \
- clean install $*
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.1
-SBT_VERSION=0.10.3
-
-PROFILE_NAME="-P local-scala-2.9.x,!scala-trunk"
-
-build $*
@@ -2,7 +2,9 @@
. $(dirname $0)/env.sh
-SCALA_VERSION=2.9.0-SNAPSHOT
-PROFILE_NAME="-P local-scala-2.9.x,!scala-trunk"
+SCALA_VERSION=2.9.2-SNAPSHOT
+SCALA_LIBRARY_VERSION=2.9.1
+
+PROFILE_NAME="-P local-scala-2.9.x,!scala-trunk,!scala-2.9.2-SNAPSHOT"
build $*
@@ -34,6 +34,7 @@ build()
${MAVEN} \
$PROFILE_NAME -U \
-Dscala.version=${SCALA_VERSION} \
+ -Dscala.library.version=${SCALA_LIBRARY_VERSION} \
-Dgit.hash=${GIT_HASH} \
-Dversion.tag=${VERSION_TAG}\
clean install $*
Oops, something went wrong.

0 comments on commit 8c8419f

Please sign in to comment.