Versions reorganization. SBT library now follows the following versio…

…ning scheme: sbt.version.scala_version-timestamp. For instance: 0.10.3.2_09-timestamp SDT core version qualifier is now padded, so that qualifiers are in increasing order. That means sdt.core will have version 2.0.0.2_09 < 2.0.0.2_10. sdt.core now has a versioned dependency on sbt.full.library, declared in MANIFEST.MF. This file should, at some point, be generated and populated with versioned dependencies. That would solve issues with multiple scala versions in the same Eclipse installation.
gkossakowski · Sep 8, 2011 · 2d33a9c · 2d33a9c
1 parent 46cae1c
commit 2d33a9c
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 27 deletions.
diff --git a/org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh b/org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh
@@ -2,10 +2,21 @@
 
 . $(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}

diff --git a/org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh b/org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh
@@ -2,10 +2,21 @@
 
 . $(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-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.9.0-1
+
 SBINARY_VERSION=0.4.0
 
 set_version ${SCALA_VERSION}

diff --git a/org.scala-ide.build-toolchain/build-toolchain-local-trunk.sh b/org.scala-ide.build-toolchain/build-toolchain-local-trunk.sh
@@ -2,10 +2,20 @@
 
 . $(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
-SCALA_PRECOMPILED=2_10_0-SNAPSHOT
 
 set_version ${SCALA_VERSION}
 

diff --git a/org.scala-ide.build-toolchain/build-toolchain-trunk.sh b/org.scala-ide.build-toolchain/build-toolchain-trunk.sh
@@ -2,10 +2,20 @@
 
 . $(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
-SCALA_PRECOMPILED=2_10_0-SNAPSHOT
 
 set_version ${SCALA_VERSION}
 

diff --git a/org.scala-ide.build-toolchain/pom.xml b/org.scala-ide.build-toolchain/pom.xml
@@ -9,7 +9,6 @@
   <packaging>pom</packaging>
 
   <properties>
-    <scala.version>2.8.0</scala.version>
     <sbt.version>0.10.3</sbt.version>
     <patch.level>p0002</patch.level>
     <encoding>UTF-8</encoding>
@@ -108,7 +107,7 @@
       <properties>
         <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
         <scala.compiler.version>${scala.version}</scala.compiler.version>
-        <sbt.library.qualifier>2_10</sbt.library.qualifier>
+        <version.suffix>2_10</version.suffix>
 
         <!-- Used as part of the artifact name for SBT cross-compiled modules. -->
         <scala.major.minor.version>2.10</scala.major.minor.version>
@@ -132,7 +131,7 @@
       <properties>
         <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
         <scala.compiler.version>${scala.version}</scala.compiler.version>
-        <sbt.library.qualifier>2_09</sbt.library.qualifier>
+        <version.suffix>2_09</version.suffix>
 
         <!-- Used as part of the directory name for compiler-interface.jar. -->
         <scala.major.minor.version>2.9</scala.major.minor.version>
@@ -157,7 +156,7 @@
       <properties>
         <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
         <scala.compiler.version>${scala.version}</scala.compiler.version>
-        <sbt.library.qualifier>2_08</sbt.library.qualifier>
+        <version.suffix>2_08</version.suffix>
 
         <!-- Used as part of the directory name for compiler-interface.jar. -->
         <scala.major.minor.version>2.8</scala.major.minor.version>

diff --git a/org.scala-ide.build/build-ide-2.8.2-SNAPSHOT b/org.scala-ide.build/build-ide-2.8.2-SNAPSHOT
@@ -3,6 +3,5 @@
 . $(dirname $0)/env.sh
 
 SCALA_VERSION=2.8.2-SNAPSHOT
-SBT_VERSION=2.8.2-SNAPSHOT
 
 build $*
diff --git a/org.scala-ide.build/build-ide-2.9.0-1.sh b/org.scala-ide.build/build-ide-2.9.0-1.sh
@@ -3,6 +3,5 @@
 . $(dirname $0)/env.sh
 
 SCALA_VERSION=2.9.0-1
-SBT_VERSION=2.9.0-1
 
 build $*
diff --git a/org.scala-ide.build/build-ide-2.9.0.final.sh b/org.scala-ide.build/build-ide-2.9.0.final.sh
@@ -3,6 +3,5 @@
 . $(dirname $0)/env.sh
 
 SCALA_VERSION=2.9.0
-SBT_VERSION=2.9.0
 
 build $*
diff --git a/org.scala-ide.build/build-ide-2.9.1-SNAPSHOT b/org.scala-ide.build/build-ide-2.9.1-SNAPSHOT
@@ -2,7 +2,6 @@
 
 . $(dirname $0)/env.sh
 
-SCALA_VERSION=2.9.1-SNAPSHOT
-SBT_VERSION=2.9.1-SNAPSHOT
+SCALA_VERSION=2.9.2-SNAPSHOT
 
 build $*
diff --git a/org.scala-ide.build/build-ide-trunk.sh b/org.scala-ide.build/build-ide-trunk.sh
@@ -3,6 +3,5 @@
 . $(dirname $0)/env.sh
 
 SCALA_VERSION=2.10.0-SNAPSHOT
-SBT_VERSION=0.10.3
 
 build $*
diff --git a/org.scala-ide.build/env.sh b/org.scala-ide.build/env.sh
@@ -34,7 +34,6 @@ build()
   ${MAVEN} \
     $PROFILE_NAME -U \
     -Dscala.version=${SCALA_VERSION} \
-    -Dsbt.version=${SBT_VERSION} \
     -Dgit.hash=${GIT_HASH} \
     -Dversion.tag=${VERSION_TAG}\
     clean install $*

diff --git a/org.scala-ide.build/pom.xml b/org.scala-ide.build/pom.xml
@@ -9,7 +9,6 @@
   <packaging>pom</packaging>
 
   <properties>
-    <scala.version>2.8.0</scala.version>
     <version.tag>nightly</version.tag>
     <version.suffix>2_10</version.suffix>
     <scala.version.short>2.10</scala.version.short>
@@ -18,6 +17,8 @@
     <maven.compiler.source>1.5</maven.compiler.source>
     <maven.compiler.target>1.5</maven.compiler.target>
     <encoding>UTF-8</encoding>
+    <!-- <toolchain.base.url>file:/Users/dragos/workspace/git/plugin/mkrepo</toolchain.base.url> -->
+    <toolchain.base.url>http://download.scala-ide.org</toolchain.base.url>
   </properties>
 
   <prerequisites>
@@ -179,7 +180,7 @@
           <id>scala-toolchain-2.8.0.final</id>
           <name>Scala Toolchain 2.8.0.final p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.8.0.final</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.8.0.final</url>
         </repository>
       </repositories>
     </profile>
@@ -212,7 +213,7 @@
           <id>scala-toolchain-2.8.1.final</id>
           <name>Scala Toolchain 2.8.1.final p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.8.1.final</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.8.1.final</url>
         </repository>
       </repositories>
     </profile>
@@ -244,7 +245,7 @@
           <id>scala-toolchain-2.8.2-SNAPSHOT</id>
           <name>Scala Toolchain 2.8.2-SNAPSHOT p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.8.2-SNAPSHOT</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.8.2-SNAPSHOT</url>
         </repository>
       </repositories>
     </profile>
@@ -277,7 +278,7 @@
           <id>scala-toolchain-2.9.0.final</id>
           <name>Scala Toolchain 2.9.0.final p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.9.0.final</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.9.0.final</url>
         </repository>
       </repositories>
     </profile>
@@ -310,7 +311,7 @@
           <id>scala-toolchain-2.9.0-1</id>
           <name>Scala Toolchain 2.9.0-1 p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.9.0-1</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.9.0-1</url>
         </repository>
       </repositories>
     </profile>
@@ -342,7 +343,7 @@
           <id>scala-toolchain-2.9.1.final</id>
           <name>Scala Toolchain 2.9.1.final p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.9.1.final</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.9.1.final</url>
         </repository>
       </repositories>
     </profile>
@@ -374,7 +375,7 @@
           <id>scala-toolchain-2.9.2-SNAPSHOT</id>
           <name>Scala Toolchain 2.9.2-SNAPSHOT p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url>
         </repository>
       </repositories>
     </profile>
@@ -403,7 +404,7 @@
           <id>scala-toolchain-trunk</id>
           <name>Scala Toolchain trunk p2 repository</name>
           <layout>p2</layout>
-          <url>http://download.scala-ide.org/scala-eclipse-toolchain-osgi-trunk</url>
+          <url>${toolchain.base.url}/scala-eclipse-toolchain-osgi-trunk</url>
         </repository>
       </repositories>
     </profile>

diff --git a/org.scala-ide.sbt/pom.xml b/org.scala-ide.sbt/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
   </parent>
   <artifactId>org.scala-ide.sbt.full.library</artifactId>
-  <version>${sbt.version}.${sbt.library.qualifier}</version>
+  <version>${sbt.version}.${version.suffix}-${maven.build.timestamp}</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -160,6 +160,7 @@
   <build>
     <outputDirectory>${basedir}</outputDirectory>
     <plugins>
+
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
         <version>2.4.1</version>
@@ -448,7 +449,7 @@
           <instructions>
             <Bundle-SymbolicName>org.scala-ide.sbt.full.library</Bundle-SymbolicName>
             <Bundle-Name>Sbt ${sbt.version} Library for Eclipse</Bundle-Name>
-            <Bundle-Version>${sbt.version}.${sbt.library.qualifier}</Bundle-Version>
+            <Bundle-Version>${sbt.version}.${version.suffix}-${maven.build.timestamp}</Bundle-Version>
             <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
             <_exportcontents>sbt.*;version=${sbt.version},xsbt.*;version=${sbt.version},xsbti.*;version=${sbt.version},sbinary.*;version=${sbinary.version},jline.*;version=0.9.94,org.apache.ivy.*;version=2.2.0</_exportcontents>
             <Embed-Directory>lib</Embed-Directory>

diff --git a/org.scala-ide.sdt.core/META-INF/MANIFEST.MF b/org.scala-ide.sdt.core/META-INF/MANIFEST.MF
@@ -39,10 +39,10 @@ Require-Bundle:
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.pde.core;resolution:=optional,
  org.eclipse.pde.ui;resolution:=optional,
- org.scala-ide.scala.library;bundle-version="[2.9.0,2.10)",
- org.scala-ide.scala.compiler;bundle-version="[2.9.0,2.10)",
+ org.scala-ide.scala.library,
+ org.scala-ide.scala.compiler,
  org.scala-refactoring.library,
- org.scala-ide.sbt.full.library;bundle-version="[0.10.3.2_09,0.10.4]",
+ org.scala-ide.sbt.full.library;bundle-version="[0.10.3,0.10.4)",
  scalariform,
  org.junit4;bundle-version="4.5.0",
  org.eclipse.ui.browser;bundle-version="3.3.0"

diff --git a/org.scala-ide.sdt.core/pom.xml b/org.scala-ide.sdt.core/pom.xml
@@ -24,6 +24,11 @@
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
+    <!-- <dependency> -->
+    <!--   <groupId>org.scala-ide</groupId> -->
+    <!--   <artifactId>org.scala-ide.sbt.full.library</artifactId> -->
+    <!--   <version>${sbt.version}.${version.suffix}</version> -->
+    <!-- </dependency> -->
   </dependencies>
 
   <build>