Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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...
commit 8c8419f5e9a6187503681bf92c050accfa978f1c 1 parent 5834e4f
Iulian Dragos authored dragos committed
View
3  org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh
@@ -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
View
3  org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh
@@ -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
View
3  org.scala-ide.build-toolchain/build-toolchain-trunk.sh
@@ -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)
View
7 org.scala-ide.build-toolchain/env.sh
@@ -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} \
View
9 org.scala-ide.build-toolchain/pom.xml
@@ -4,7 +4,7 @@
<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>
@@ -12,6 +12,7 @@
<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>
View
7 org.scala-ide.build/build-ide-2.9.0-1.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.0-1
-
-build $*
View
7 org.scala-ide.build/build-ide-2.9.0.final.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.0
-
-build $*
View
7 org.scala-ide.build/build-ide-2.9.1-SNAPSHOT
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.2-SNAPSHOT
-
-build $*
View
7 org.scala-ide.build/build-ide-2.9.1.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.9.1
-
-build $*
View
11 org.scala-ide.build/build-ide-local-2.8.1.final.sh
@@ -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 $*
View
10 org.scala-ide.build/build-ide-local-2.9.1.final.sh
@@ -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 $*
View
6 org.scala-ide.build/build-ide-local-2.9.x.sh
@@ -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 $*
View
1  org.scala-ide.build/env.sh
@@ -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 $*
View
228 org.scala-ide.build/pom.xml
@@ -12,15 +12,15 @@
<version.tag>nightly</version.tag>
<version.suffix>2_10</version.suffix>
<scala.version.short>2.10</scala.version.short>
- <sbt.version>0.10.3</sbt.version>
+ <sbt.version>0.11.4</sbt.version>
<tycho.version>0.12.0</tycho.version>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<encoding>UTF-8</encoding>
- <!-- <repo.scala-ide>file:/Users/dragos/workspace/git/plugin/mkrepo</repo.scala-ide> -->
+ <!-- <repo.scala-ide>file:/absolute/path/to/scala-ide/org.scala-ide.build-toolchain/mkrepo/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</repo.scala-ide> -->
<repo.scala-ide>http://download.scala-ide.org</repo.scala-ide>
<repo.helios>http://download.eclipse.org/releases/helios/</repo.helios>
- <!-- <repo.helios>file:/Users/dragos/Sites/helios/helios-mirror</repo.helios> -->
+ <!-- <repo.helios>file:/absolute/path/to/helios/helios-mirror</repo.helios> -->
</properties>
<prerequisites>
@@ -154,72 +154,6 @@
</pluginRepositories>
<profiles>
<profile>
- <id>scala-2.8.0</id>
- <activation>
- <property>
- <name>scala.version</name>
- <value>2.8.0</value>
- </property>
- </activation>
- <properties>
- <version.suffix>2_08</version.suffix>
- </properties>
- <repositories>
- <repository>
- <id>scala-refactoring-2.8.0.final</id>
- <name>Scala Refactoring Scala 2.8.0.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.8.0.final</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scalariform-2.8.0.final</id>
- <name>Scalariform Scala 2.8.0.final p2 repo</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.8.0.final</url>
- </repository>
- <repository>
- <id>scala-toolchain-2.8.0.final</id>
- <name>Scala Toolchain 2.8.0.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.8.0.final</url>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>scala-2.8.1</id>
- <activation>
- <property>
- <name>scala.version</name>
- <value>2.8.1</value>
- </property>
- </activation>
- <properties>
- <version.suffix>2_08</version.suffix>
- </properties>
- <repositories>
- <repository>
- <id>scala-refactoring-2.8.1.final</id>
- <name>Scala Refactoring Scala 2.8.1.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.8.1.final</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scalariform-2.8.1.final</id>
- <name>Scalariform Scala 2.8.1.final p2 repo</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.8.1.final</url>
- </repository>
- <repository>
- <id>scala-toolchain-2.8.1.final</id>
- <name>Scala Toolchain 2.8.1.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.8.1.final</url>
- </repository>
- </repositories>
- </profile>
- <profile>
<id>scala-2.8.2-SNAPSHOT</id>
<activation>
<property>
@@ -284,72 +218,6 @@
</repositories>
</profile>
<profile>
- <id>scala-2.9.0</id>
- <activation>
- <property>
- <name>scala.version</name>
- <value>2.9.0</value>
- </property>
- </activation>
- <properties>
- <version.suffix>2_09</version.suffix>
- </properties>
- <repositories>
- <repository>
- <id>scala-refactoring-2.9.0.final</id>
- <name>Scala Refactoring Scala 2.9.0.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.9.0.final</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scalariform-2.9.0.final</id>
- <name>Scalariform Scala 2.9.0.final p2 repo</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.9.0.final</url>
- </repository>
- <repository>
- <id>scala-toolchain-2.9.0.final</id>
- <name>Scala Toolchain 2.9.0.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.9.0.final</url>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>scala-2.9.0-1</id>
- <activation>
- <property>
- <name>scala.version</name>
- <value>2.9.0-1</value>
- </property>
- </activation>
- <properties>
- <version.suffix>2_09</version.suffix>
- </properties>
- <repositories>
- <repository>
- <id>scala-refactoring-2.9.0-1</id>
- <name>Scala Refactoring Scala 2.9.0-1 p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.9.0-1</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scalariform-2.9.0-1</id>
- <name>Scalariform Scala 2.9.0-1 p2 repo</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.9.0-1</url>
- </repository>
- <repository>
- <id>scala-toolchain-2.9.0-1</id>
- <name>Scala Toolchain 2.9.0-1 p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.9.0-1</url>
- </repository>
- </repositories>
- </profile>
- <profile>
<id>scala-2.9.1</id>
<activation>
<property>
@@ -410,6 +278,7 @@
<name>Scala Toolchain 2.9.2-SNAPSHOT p2 repository</name>
<layout>p2</layout>
<url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url>
+ <!-- <url>file:/absolute/path/to/org.scala-ide.build-toolchain/mkrepo/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url> -->
</repository>
</repositories>
</profile>
@@ -442,73 +311,7 @@
</repository>
</repositories>
</profile>
- <profile>
- <id>local-scala-2.8.0</id>
- <properties>
- <version.suffix>2_08</version.suffix>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.scala-ide</groupId>
- <artifactId>org.scala-ide.scala.library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-ide</groupId>
- <artifactId>org.scala-ide.scala.compiler</artifactId>
- <version>${scala.version}</version>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>scala-refactoring-2.8.0.final</id>
- <name>Scala Refactoring Scala 2.8.0.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.8.0.final</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scalariform-2.8.0.final</id>
- <name>Scalariform Scala 2.8.0.final p2 repo</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.8.0.final</url>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>local-scala-2.8.1</id>
- <properties>
- <version.suffix>2_08</version.suffix>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.scala-ide</groupId>
- <artifactId>org.scala-ide.scala.library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-ide</groupId>
- <artifactId>org.scala-ide.scala.compiler</artifactId>
- <version>${scala.version}</version>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>scala-refactoring-2.8.1.final</id>
- <name>Scala Refactoring Scala 2.8.1.final p2 repository</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.8.1.final</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>scalariform-2.8.1.final</id>
- <name>Scalariform Scala 2.8.1.final p2 repo</name>
- <layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.8.1.final</url>
- </repository>
- </repositories>
- </profile>
- <!-- local 2.9.0-SNAPSHOT -->
+ <!-- local 2.9.x-SNAPSHOT -->
<profile>
<id>local-scala-2.9.x</id>
<properties>
@@ -518,7 +321,7 @@
<dependency>
<groupId>org.scala-ide</groupId>
<artifactId>org.scala-ide.scala.library</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
</dependency>
<dependency>
<groupId>org.scala-ide</groupId>
@@ -528,18 +331,23 @@
</dependencies>
<repositories>
<repository>
- <id>scala-refactoring-2.9.x</id>
- <name>Scala Refactoring Scala 2.9.0.final p2 repository</name>
+ <id>scala-refactoring-2.9.2-SNAPSHOT</id>
+ <name>Scala Refactoring Scala 2.9.2-SNAPSHOT p2 repository</name>
<layout>p2</layout>
- <url>${repo.scala-ide}/scala-refactoring-2.9.0.final</url>
- <snapshots><enabled>false</enabled></snapshots>
+ <url>${repo.scala-ide}/scala-refactoring-2.9.2-SNAPSHOT</url>
</repository>
<repository>
- <id>scalariform-2.9.x</id>
- <name>Scalariform Scala 2.9.0.final p2 repo</name>
+ <id>scalariform-2.9.2-SNAPSHOT</id>
+ <name>Scalariform Scala 2.9.2-SNAPSHOT p2 repo</name>
<layout>p2</layout>
- <url>${repo.scala-ide}/scalariform-2.9.0.final</url>
+ <url>${repo.scala-ide}/scalariform-2.9.2-SNAPSHOT</url>
</repository>
+ <!-- <repository> -->
+ <!-- <id>scala-toolchain-2.8.2-SNAPSHOT</id> -->
+ <!-- <name>Scala Toolchain 2.8.2-SNAPSHOT p2 repository</name> -->
+ <!-- <layout>p2</layout> -->
+ <!-- <url>file:/absolute/path/to/org.scala-ide.build-toolchain/mkrepo/scala-eclipse-toolchain-osgi-2.9.2-SNAPSHOT</url> -->
+ <!-- </repository> -->
</repositories>
</profile>
View
2  org.scala-ide.sbt.full.library/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.1</version>
+ <version>2.9.2-SNAPSHOT</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.sbt.full.library</artifactId>
View
2  org.scala-ide.scala.compiler/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.1</version>
+ <version>2.9.2-SNAPSHOT</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.compiler</artifactId>
View
9 org.scala-ide.scala.library/pom.xml
@@ -5,10 +5,11 @@
<parent>
<groupId>org.scala-ide</groupId>
<artifactId>scala-toolchain-for-eclipse</artifactId>
- <version>2.9.1</version>
+ <version>2.9.2-SNAPSHOT</version>
<relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
</parent>
<artifactId>org.scala-ide.scala.library</artifactId>
+ <version>${scala.library.version}</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -80,7 +81,7 @@
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
<classifier>sources</classifier>
<type>jar</type>
<destFileName>scala-library-src.jar</destFileName>
@@ -88,7 +89,7 @@
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scala-swing</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
<classifier>sources</classifier>
<type>jar</type>
<destFileName>scala-swing-src.jar</destFileName>
@@ -96,7 +97,7 @@
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scala-dbc</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.library.version}</version>
<classifier>sources</classifier>
<type>jar</type>
<destFileName>scala-dbc-src.jar</destFileName>
View
5 org.scala-ide.sdt.core/pom.xml
@@ -13,11 +13,6 @@
<dependencies>
<dependency>
- <groupId>org.scala-ide</groupId>
- <artifactId>org.scala-ide.sdt.aspects</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.miglayout</groupId>
<artifactId>miglayout</artifactId>
<version>3.7.4</version>
View
3  org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala
@@ -29,6 +29,7 @@ import scala.tools.eclipse.templates.ScalaTemplateManager
import org.eclipse.jdt.ui.PreferenceConstants
import org.eclipse.core.resources.IResourceDelta
import scala.tools.eclipse.util.HasLogger
+import org.osgi.framework.Bundle
object ScalaPlugin {
var plugin: ScalaPlugin = _
@@ -124,7 +125,7 @@ class ScalaPlugin extends AbstractUIPlugin with IResourceChangeListener with IEl
//lazy val sbtScalaCompiler = pathInBundle(sbtCompilerBundle, "/lib/scala-" + shortScalaVer + "/lib/scala-compiler.jar")
val scalaLibBundle = {
- val bundles = Platform.getBundles(ScalaPlugin.plugin.libraryPluginId, scalaCompilerBundleVersion.toString())
+ val bundles = Option(Platform.getBundles(ScalaPlugin.plugin.libraryPluginId, scalaCompilerBundleVersion.toString())).getOrElse(Array[Bundle]())
logger.debug("[scalaLibBundle] Found %d bundles: %s".format(bundles.size, bundles.toList.mkString(", ")))
bundles.find(_.getVersion() == scalaCompilerBundleVersion).getOrElse {
logger.warning("Couldnt find a match for %s in %s. Using default.".format(scalaCompilerBundleVersion, bundles.toList.mkString(", ")))
Please sign in to comment.
Something went wrong with that request. Please try again.