Merge branch 'wip_experiment'

org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh

@@ -2,8 +2,25 @@
 
 . $(dirname $0)/env.sh
 
+# Scala compiler version to be used as a dependency
 SCALA_VERSION=2.8.2-SNAPSHOT
 
+#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
+
+# 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)
+SCALA_PRECOMPILED=2_8_2-SNAPSHOT
+
+# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
+# It is usually enough to have a binary compatible version of SCALA_VERSION
+# For instance, here we can use 2.9.0, for a 2.9.1 compiler
+SBT_SCALA_VERSION=2.8.1
+
+SBINARY_VERSION=0.4.0
+
 set_version ${SCALA_VERSION}
 
+PROFILE="-P sbt-2.8,default"
+
 build $*

org.scala-ide.build-toolchain/build-toolchain-2.9.0-1.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+SCALA_VERSION=2.9.0-1
+SCALA_PRECOMPILED=2_9_0-1
+SBT_SCALA_VERSION=2.9.0-1
+SBINARY_VERSION=0.4.0
+
+set_version ${SCALA_VERSION}
+
+PROFILE="-P sbt-2.9,default"
+
+build $*

org.scala-ide.build-toolchain/build-toolchain-2.9.0.final.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+SCALA_VERSION=2.9.0
+SCALA_PRECOMPILED=2_9_0
+SBT_SCALA_VERSION=2.9.0
+SBINARY_VERSION=0.4.0
+
+set_version ${SCALA_VERSION}
+
+PROFILE="-P sbt-2.9,default"
+
+build $*

org.scala-ide.build-toolchain/build-toolchain-2.9.1.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+# Scala compiler version to be used as a dependency
+SCALA_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
+# 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)
+SCALA_PRECOMPILED=2_9_1
+
+# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
+# It is usually enough to have a binary compatible version of SCALA_VERSION
+# For instance, here we can use 2.9.0, for a 2.9.1 compiler
+SBT_SCALA_VERSION=2.9.1
+
+SBINARY_VERSION=0.4.0
+
+set_version ${SCALA_VERSION}
+
+PROFILE="-P sbt-2.9,default"
+
+build $*

org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+# Scala compiler version to be used as a dependency
+SCALA_VERSION=2.9.2-SNAPSHOT
+
+#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
+
+# 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)
+SCALA_PRECOMPILED=2_9_1
+
+# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
+# It is usually enough to have a binary compatible version of SCALA_VERSION
+# For instance, here we can use 2.9.0, for a 2.9.1 compiler
+SBT_SCALA_VERSION=2.9.1
+
+SBINARY_VERSION=0.4.0
+
+set_version ${SCALA_VERSION}
+
+PROFILE="-P sbt-2.9,default"
+
+build $*

org.scala-ide.build-toolchain/build-toolchain-2.8.0.final.sh → org.scala-ide.build-toolchain/build-toolchain-local-2.8.x.sh

@@ -2,8 +2,10 @@
 
 . $(dirname $0)/env.sh
 
-SCALA_VERSION=2.8.0
+SCALA_VERSION=2.8.2-SNAPSHOT
 
 set_version ${SCALA_VERSION}
 
+PROFILE="-P local"
+
 build $*

org.scala-ide.build-toolchain/build-toolchain-local-trunk.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+. $(dirname $0)/env.sh
+
+# Scala compiler version to be used as a dependency
+SCALA_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)
+SCALA_PRECOMPILED=2_10_0-SNAPSHOT
+
+# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
+# It is usually enough to have a binary compatible version of SCALA_VERSION
+# For instance, here we can use 2.9.0, for a 2.9.1 compiler
+SBT_SCALA_VERSION=2.10.0-SNAPSHOT
+
+SBINARY_VERSION=0.4.0
+
+set_version ${SCALA_VERSION}
+
+PROFILE="-P sbt-2.10,local,!default"
+
+build $*

org.scala-ide.build-toolchain/build-toolchain-trunk.sh

@@ -2,8 +2,23 @@
 
 . $(dirname $0)/env.sh
 
-SCALA_VERSION=2.9.0-SNAPSHOT
+# Scala compiler version to be used as a dependency
+SCALA_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)
+SCALA_PRECOMPILED=2_10_0-SNAPSHOT
+
+# The scala version that was used to compile SBT dependencies (it is part of the artifact name)
+# It is usually enough to have a binary compatible version of SCALA_VERSION
+# For instance, here we can use 2.9.0, for a 2.9.1 compiler
+SBT_SCALA_VERSION=2.10.0-SNAPSHOT
+
+SBINARY_VERSION=0.4.0
 
 set_version ${SCALA_VERSION}
 
+PROFILE="-P sbt-2.10,default"
+
 build $*

org.scala-ide.build-toolchain/env.sh

@@ -23,7 +23,11 @@ build()
 {
     ${MAVEN} \
         -U \
+        $PROFILE \
         -Dscala.version=${SCALA_VERSION} \
+        -Dsbt.scala.version=${SBT_SCALA_VERSION} \
+        -Dsbinary.version=${SBINARY_VERSION} \
+        -Dscala.precompiled.version=${SCALA_PRECOMPILED} \
         clean install $* 
 }