Permalink
Browse files

Merge branch 'master' into feature/scala-debugger-1000864

  • Loading branch information...
2 parents a1a4d8b + 684a051 commit dabbd594ddf5eb36acd9f362c89f12d168b2aaa7 @skyluc skyluc committed Mar 23, 2012
Showing with 294 additions and 477 deletions.
  1. +0 −29 org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh
  2. +0 −14 org.scala-ide.build-toolchain/build-toolchain-2.9.0-1.sh
  3. +0 −14 org.scala-ide.build-toolchain/build-toolchain-2.9.0.final.sh
  4. +0 −26 org.scala-ide.build-toolchain/build-toolchain-2.9.1.sh
  5. +2 −2 org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh
  6. +0 −11 org.scala-ide.build-toolchain/build-toolchain-local-2.8.x.sh
  7. +0 −27 org.scala-ide.build-toolchain/build-toolchain-local-trunk.sh
  8. +0 −15 org.scala-ide.build-toolchain/build-toolchain-maintenance-2.8.0.final.sh
  9. +1 −1 org.scala-ide.build-toolchain/build-toolchain-trunk.sh
  10. +17 −97 org.scala-ide.build-toolchain/pom.xml
  11. +0 −7 org.scala-ide.build/build-ide-2.8.3-SNAPSHOT
  12. 0 org.scala-ide.build/{build-ide-2.9.2-SNAPSHOT → build-ide-2.9.x.sh}
  13. +0 −11 org.scala-ide.build/build-ide-local-2.8.x.sh
  14. +0 −11 org.scala-ide.build/build-ide-maintenance-2.8.0.final.sh
  15. +1 −1 org.scala-ide.build/env.sh
  16. +12 −122 org.scala-ide.build/pom.xml
  17. +1 −1 org.scala-ide.sbt.full.library/pom.xml
  18. +8 −8 org.scala-ide.scala.compiler/pom.xml
  19. +160 −53 org.scala-ide.scala.library/pom.xml
  20. +1 −1 org.scala-ide.sdt.aspects/pom.xml
  21. +1 −1 org.scala-ide.sdt.core.tests/pom.xml
  22. +1 −2 org.scala-ide.sdt.core.tests/src/scala/tools/eclipse/hyperlinks/HyperlinkDetectorTests.scala
  23. +2 −1 org.scala-ide.sdt.core.tests/src/scala/tools/eclipse/sbtbuilder/ScalaCompilerClasspathTest.scala
  24. BIN org.scala-ide.sdt.core.tests/test-workspace/builder-compiler-classpath/lib/2.10.x/scala-compiler.jar
  25. +1 −0 org.scala-ide.sdt.core.tests/test-workspace/hyperlinks/src/hyperlinks/SimpleHyperlinking.scala
  26. +2 −1 org.scala-ide.sdt.core/pom.xml
  27. +6 −2 org.scala-ide.sdt.core/src/scala/tools/eclipse/LocateSymbol.scala
  28. +5 −2 org.scala-ide.sdt.core/src/scala/tools/eclipse/logging/EclipseLogger.scala
  29. +25 −9 ...ide.sdt.core/src/scala/tools/eclipse/properties/syntaxcolouring/ColourPreferenceInitializer.scala
  30. +2 −2 org.scala-ide.sdt.core/src/scala/tools/eclipse/properties/syntaxcolouring/ScalaSyntaxClass.scala
  31. +3 −1 ...a-ide.sdt.core/src/scala/tools/eclipse/semantichighlighting/classifier/SymbolClassification.scala
  32. +1 −1 org.scala-ide.sdt.feature/pom.xml
  33. +1 −1 org.scala-ide.sdt.source.feature/pom.xml
  34. +1 −1 org.scala-ide.sdt.update-site/pom.xml
  35. +1 −1 org.scala-ide.sdt.weaving.feature/pom.xml
  36. +38 −0 org.scala-ide/pom.xml
  37. +1 −1 update-scala.sh
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-# 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
-# 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_3-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.8.0, for a 2.8.1 compiler
-SBT_SCALA_VERSION=2.8.3-SNAPSHOT
-
-SBINARY_VERSION=0.4.0
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P sbt-2.8,default"
-
-build $*
@@ -1,14 +0,0 @@
-#!/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 $*
@@ -1,14 +0,0 @@
-#!/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 $*
@@ -1,26 +0,0 @@
-#!/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 $*
@@ -6,7 +6,7 @@
SCALA_VERSION=2.9.2-SNAPSHOT
# Scala library version
-SCALA_LIBRARY_VERSION=2.9.1
+SCALA_LIBRARY_VERSION=2.9.2-SNAPSHOT
#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
@@ -24,6 +24,6 @@ SBINARY_VERSION=0.4.0
set_version ${SCALA_VERSION}
-PROFILE="-P sbt-2.9,default"
+PROFILE="-P sbt-2.9"
build $*
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.2-SNAPSHOT
-
-set_version ${SCALA_VERSION}
-
-PROFILE="-P local"
-
-build $*
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-# 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)
-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 $*
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.0
-SCALA_MAINTENANCE_VERSION=2.8.0.final-maintenance
-
-set_version ${SCALA_VERSION}
-
-${MAVEN} \
- -U \
- -P maintenance,!default \
- -Dscala.version=${SCALA_VERSION} \
- -Dscala.maintenance.version=${SCALA_MAINTENANCE_VERSION} \
- clean install $*
@@ -22,6 +22,6 @@ SBINARY_VERSION=0.4.0
set_version ${SCALA_VERSION}
-PROFILE="-P sbt-2.10,default"
+PROFILE="-P sbt-2.10"
build $*
@@ -2,17 +2,23 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.scala-ide</groupId>
+ <parent>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>scala-ide-for-eclipse</artifactId>
+ <version>1</version>
+ <relativePath>../org.scala-ide/pom.xml</relativePath>
+ </parent>
+
<artifactId>scala-toolchain-for-eclipse</artifactId>
<version>2.9.2-SNAPSHOT</version>
<name>The Scala Toolchain for Eclipse</name>
<packaging>pom</packaging>
<properties>
- <sbt.version>0.11.2-scalaide-02</sbt.version>
- <patch.level>p0002</patch.level>
- <encoding>UTF-8</encoding>
+ <sbt.version>0.11.2-scalaide-03</sbt.version>
+ <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
<scala.library.version>${scala.version}</scala.library.version>
+ <scala.compiler.version>${scala.version}</scala.compiler.version>
</properties>
<modules>
@@ -42,6 +48,11 @@
<artifactId>scala-dbc</artifactId>
<version>${scala.library.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-actors</artifactId>
+ <version>${scala.library.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -62,61 +73,15 @@
</build>
<profiles>
<profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
- </properties>
-
- <repositories>
- <repository>
- <id>sonatype.releases</id>
- <name>Replacement for Scala Tools Maven2 Repository</name>
- <url>https://oss.sonatype.org/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>sonatype.snapshot</id>
- <name>Replacement for Scala Tools maven snapshot repository</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>local</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
- </properties>
- </profile>
-
- <profile>
<id>sbt-2.10</id>
<properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
<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>
+ <scala.major.minor.version>${scala.version.short}</scala.major.minor.version>
<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
</properties>
<repositories>
<repository>
@@ -135,13 +100,10 @@
<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>
+ <scala.major.minor.version>${scala.version.short}</scala.major.minor.version>
<!-- Used as part of the artifact name for SBT cross-compiled modules. -->
<sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>
-
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
</properties>
<repositories>
<repository>
@@ -151,47 +113,5 @@
</repository>
</repositories>
</profile>
-
- <profile>
- <id>sbt-2.8</id>
- <properties>
- <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
- <scala.compiler.version>${scala.version}</scala.compiler.version>
- <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>
-
- <!-- Used as part of the artifact name for SBT cross-compiled modules. -->
- <sbt.compiled.version>${sbt.scala.version}</sbt.compiled.version>
- <maintenance.suffix></maintenance.suffix>
- <patch.level.suffix></patch.level.suffix>
- </properties>
- <repositories>
- <repository>
- <id>typesafe-ide-2.8</id>
- <name>Typesafe IDE 2.8 repository</name>
- <url>http://repo.typesafe.com/typesafe/ide-2.8</url>
- </repository>
- </repositories>
- </profile>
-
-
- <profile>
- <id>maintenance</id>
- <properties>
- <scala.compiler.groupid>org.scala-ide</scala.compiler.groupid>
- <scala.compiler.version>2.8.0.final-maintenance</scala.compiler.version>
- <maintenance.suffix>-sdt</maintenance.suffix>
- <patch.level.suffix>-${patch.level}</patch.level.suffix>
- </properties>
- <repositories>
- <repository>
- <id>scala-ide.org</id>
- <name>Scala IDE Toolchain maintenance repository</name>
- <url>http://download.scala-ide.org/scala-eclipse-toolchain-2.8.0.final-maintenance</url>
- </repository>
- </repositories>
- </profile>
</profiles>
</project>
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.3-SNAPSHOT
-
-build $*
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.2-SNAPSHOT
-
-${MAVEN} \
- -U \
- -P local-scala-2.8.1,!scala-2.8.1 \
- -Dscala.version=${SCALA_VERSION} \
- clean install $*
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. $(dirname $0)/env.sh
-
-SCALA_VERSION=2.8.0
-
-${MAVEN} \
- -U \
- -P scala-2.8.0-maintenance,!scala-2.8.0 \
- -Dscala.version=${SCALA_VERSION} \
- clean install $*
@@ -32,7 +32,7 @@ build()
{
${MAVEN} \
- $PROFILE_NAME -U \
+ $PROFILE -U \
-Dscala.version=${SCALA_VERSION} \
-Dscala.library.version=${SCALA_LIBRARY_VERSION} \
-Dgit.hash=${GIT_HASH} \
Oops, something went wrong. Retry.

0 comments on commit dabbd59

Please sign in to comment.