Permalink
Browse files

Merge sbt integration into our main branch. Sbt builder available by …

…choosing it in the Scala -> Build Manager -> sbt. Have fun! Error reporting in mixed Scala/Java projects for Java files needs more work (eg getting location from stdout java compiler error messages) but other than that multi- and mixed-project integration works fine.
  • Loading branch information...
1 parent 198e058 commit ca6e94db49fa679e3d0b7bc4c36597e5988e2229 @hubertp hubertp committed Aug 10, 2011
Showing with 1,424 additions and 54 deletions.
  1. +7 −1 org.scala-ide.build-toolchain/build-toolchain-2.8.1.final.sh
  2. +8 −1 org.scala-ide.build-toolchain/build-toolchain-2.8.x.sh
  3. +7 −1 org.scala-ide.build-toolchain/build-toolchain-2.9.0-1.sh
  4. +8 −1 org.scala-ide.build-toolchain/build-toolchain-2.9.0.final.sh
  5. +9 −2 org.scala-ide.build-toolchain/build-toolchain-2.9.x.sh
  6. +7 −1 org.scala-ide.build-toolchain/build-toolchain-trunk.sh
  7. +4 −0 org.scala-ide.build-toolchain/env.sh
  8. +59 −0 org.scala-ide.build-toolchain/pom.xml
  9. +1 −0 org.scala-ide.build/build-ide-2.8.0.final
  10. +1 −0 org.scala-ide.build/build-ide-2.8.1.final
  11. +1 −0 org.scala-ide.build/build-ide-2.8.2-SNAPSHOT
  12. +1 −0 org.scala-ide.build/build-ide-2.9.0-1.sh
  13. +1 −0 org.scala-ide.build/build-ide-2.9.0.final.sh
  14. +1 −0 org.scala-ide.build/build-ide-2.9.1-SNAPSHOT
  15. +1 −0 org.scala-ide.build/build-ide-local-trunk.sh
  16. +1 −0 org.scala-ide.build/build-ide-trunk.sh
  17. +1 −0 org.scala-ide.build/env.sh
  18. +41 −1 org.scala-ide.build/pom.xml
  19. +32 −0 org.scala-ide.sbt/.classpath
  20. +22 −0 org.scala-ide.sbt/.project
  21. +463 −0 org.scala-ide.sbt/pom.xml
  22. +1 −1 org.scala-ide.scala.compiler/pom.xml
  23. +1 −1 org.scala-ide.scala.library/pom.xml
  24. +37 −9 org.scala-ide.sdt.core/.classpath
  25. +1 −0 org.scala-ide.sdt.core/META-INF/MANIFEST.MF
  26. +1 −1 org.scala-ide.sdt.core/pom.xml
  27. +14 −4 org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaBuilder.scala
  28. +1 −1 org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaClasspathContainers.scala
  29. +22 −1 org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala
  30. +4 −4 org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaProject.scala
  31. +19 −5 org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/BuildReporter.scala
  32. +1 −0 org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/refined/EclipseRefinedBuildManager.scala
  33. +155 −0 org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/AnalysisCompile.scala
  34. +375 −11 ...ala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/EclipseSbtBuildManager.scala
  35. +79 −0 org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/SbtConf.scala
  36. +21 −0 org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/ScalaSbtCompiler.scala
  37. +1 −1 org.scala-ide.sdt.core/src/scala/tools/eclipse/properties/CompilerSettings.scala
  38. +8 −7 org.scala-ide.sdt.core/src/scala/tools/eclipse/util/IDESettings.scala
  39. +7 −0 org.scala-ide.sdt.feature/feature.xml
@@ -3,7 +3,13 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.8.1
+SCALA_PRECOMPILED=2_8_1
+SBT_VERSION=0.10.1-SNAPSHOT
+SBT_SCALA_VERSION=2.8.1
+SBINARY_VERSION=0.4.0
-set_version ${SCALA_VERSION}
+set_version ${SCALA_VERSION} ${SBT_VERSION} ${SBINARY_VERSION} ${SCALA_PRECOMPILED} ${SBT_SCALA_VERSION}
+
+PROFILE="-P sbt-2.8"
build $*
@@ -3,7 +3,14 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.8.2-SNAPSHOT
+#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
+SCALA_PRECOMPILED=2_8_2-SNAPSHOT
+SBT_SCALA_VERSION=2.8.1
+SBT_VERSION=0.10.1-SNAPSHOT
+SBINARY_VERSION=0.4.0
-set_version ${SCALA_VERSION}
+set_version ${SCALA_VERSION} ${SBT_VERSION} ${SBINARY_VERSION} ${SCALA_PRECOMPILED} ${SBT_SCALA_VERSION}
+
+PROFILE="-P sbt-2.8,default"
build $*
@@ -3,7 +3,13 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.9.0-1
+SCALA_PRECOMPILED=2_9_0-1
+SBT_VERSION=0.10.1-SNAPSHOT
+SBT_SCALA_VERSION=2.9.0-1
+SBINARY_VERSION=0.4.0
-set_version ${SCALA_VERSION}
+set_version ${SCALA_VERSION} ${SBT_VERSION} ${SBINARY_VERSION} ${SCALA_PRECOMPILED} ${SBT_SCALA_VERSION}
+
+PROFILE="-P sbt-2.9,default"
build $*
@@ -2,8 +2,15 @@
. $(dirname $0)/env.sh
+
SCALA_VERSION=2.9.0
+SCALA_PRECOMPILED=2_9_0
+SBT_VERSION=0.10.1-SNAPSHOT
+SBT_SCALA_VERSION=2.9.0
+SBINARY_VERSION=0.4.0
+
+set_version ${SCALA_VERSION} ${SBT_VERSION} ${SBINARY_VERSION} ${SCALA_PRECOMPILED} ${SBT_SCALA_VERSION}
-set_version ${SCALA_VERSION}
+PROFILE="-P sbt-2.9,default"
build $*
@@ -2,8 +2,15 @@
. $(dirname $0)/env.sh
-SCALA_VERSION=2.9.0-SNAPSHOT
+SCALA_VERSION=2.9.1-SNAPSHOT
+#THIS NEEDS TO BE UPDATED ONCE WE HAVE SNAPSHOTS
+SCALA_PRECOMPILED=2_9_1-SNAPSHOT
+SBT_SCALA_VERSION=2.9.0-1
+SBT_VERSION=0.10.1-SNAPSHOT
+SBINARY_VERSION=0.4.0
-set_version ${SCALA_VERSION}
+set_version ${SCALA_VERSION} ${SBT_VERSION} ${SBINARY_VERSION} ${SCALA_PRECOMPILED} ${SBT_SCALA_VERSION}
+
+PROFILE="-P sbt-2.9,default"
build $*
@@ -3,7 +3,13 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.10.0-SNAPSHOT
+SBT_VERSION=0.10.1-SNAPSHOT
+SBT_SCALA_VERSION=2.10.0-SNAPSHOT
+SBINARY_VERSION=0.4.0
+SCALA_PRECOMPILED=2_10_0-SNAPSHOT
-set_version ${SCALA_VERSION}
+set_version ${SCALA_VERSION} ${SBT_VERSION} ${SBINARY_VERSION} ${SCALA_PRECOMPILED} ${SBT_SCALA_VERSION}
+
+PROFILE="-P sbt-2.10,default"
build $*
@@ -25,6 +25,10 @@ build()
-U \
$PROFILE \
-Dscala.version=${SCALA_VERSION} \
+ -Dsbt.version=${SBT_VERSION} \
+ -Dsbt.scala.version=${SBT_SCALA_VERSION} \
+ -Dsbinary.version=${SBINARY_VERSION} \
+ -Dscala.precompiled.version=${SCALA_PRECOMPILED} \
clean install $*
}
@@ -10,13 +10,15 @@
<properties>
<scala.version>2.8.0</scala.version>
+ <sbt.version>0.10.1-SNAPSHOT</sbt.version>
<patch.level>p0002</patch.level>
<encoding>UTF-8</encoding>
</properties>
<modules>
<module>../org.scala-ide.scala.compiler</module>
<module>../org.scala-ide.scala.library</module>
+ <module>../org.scala-ide.sbt</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -100,6 +102,63 @@
<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>
+ <scala.major.minor.version>2.10</scala.major.minor.version>
+ <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.10</id>
+ <name>Typesafe IDE 2.10 repository</name>
+ <url>http://repo.typesafe.com/typesafe/ide-2.10</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>sbt-2.9</id>
+ <properties>
+ <scala.compiler.groupid>org.scala-lang</scala.compiler.groupid>
+ <scala.compiler.version>${scala.version}</scala.compiler.version>
+ <scala.major.minor.version>2.9</scala.major.minor.version>
+ <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.9</id>
+ <name>Typesafe IDE 2.9 repository</name>
+ <url>http://repo.typesafe.com/typesafe/ide-2.9</url>
+ </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>
+ <scala.major.minor.version>2.8</scala.major.minor.version>
+ <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>
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.8.0
+SBT_VERSION=2.8.1
build $*
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.8.1
+SBT_VERSION=2.8.1
build $*
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.8.2-SNAPSHOT
+SBT_VERSION=2.8.2-SNAPSHOT
build $*
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.9.0-1
+SBT_VERSION=2.9.0-1
build $*
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.9.0
+SBT_VERSION=2.9.0
build $*
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.9.1-SNAPSHOT
+SBT_VERSION=2.9.1-SNAPSHOT
build $*
@@ -3,6 +3,7 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.10.0-SNAPSHOT
+SBT_VERSION=2.10.0-SNAPSHOT
PROFILE_NAME="-P local-scala-trunk,!scala-trunk"
build $*
@@ -3,5 +3,6 @@
. $(dirname $0)/env.sh
SCALA_VERSION=2.10.0-SNAPSHOT
+SBT_VERSION=2.10.0-SNAPSHOT
build $*
@@ -34,6 +34,7 @@ build()
${MAVEN} \
$PROFILE_NAME -U \
-Dscala.version=${SCALA_VERSION} \
+ -Dsbt.version=${SBT_VERSION} \
-Dgit.hash=${GIT_HASH} \
-Dversion.tag=${VERSION_TAG}\
clean install $*
@@ -13,7 +13,7 @@
<version.tag>nightly</version.tag>
<version.suffix>210</version.suffix>
<tycho.version>0.11.1</tycho.version>
- <sbt.version>0.9.0-SNAPSHOT</sbt.version>
+ <sbt.version>0.10.1-SNAPSHOT</sbt.version>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<encoding>UTF-8</encoding>
@@ -194,6 +194,13 @@
<value>2.8.1</value>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.sbt.full.library</artifactId>
+ <version>${sbt.version}</version>
+ </dependency>
+ </dependencies>
<properties>
<version.suffix>28</version.suffix>
</properties>
@@ -227,6 +234,13 @@
<value>2.8.2-SNAPSHOT</value>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.sbt.full.library</artifactId>
+ <version>${sbt.version}</version>
+ </dependency>
+ </dependencies>
<properties>
<version.suffix>28</version.suffix>
</properties>
@@ -292,6 +306,13 @@
<value>2.9.0-1</value>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.sbt.full.library</artifactId>
+ <version>${sbt.version}</version>
+ </dependency>
+ </dependencies>
<properties>
<version.suffix>29</version.suffix>
</properties>
@@ -325,6 +346,13 @@
<value>2.9.1-SNAPSHOT</value>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.sbt.full.library</artifactId>
+ <version>${sbt.version}</version>
+ </dependency>
+ </dependencies>
<properties>
<version.suffix>29</version.suffix>
</properties>
@@ -357,6 +385,13 @@
<value>2.10.0-SNAPSHOT</value>
</property>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.sbt.full.library</artifactId>
+ <version>${sbt.version}</version>
+ </dependency>
+ </dependencies>
<repositories>
<repository>
<id>scala-refactoring-trunk</id>
@@ -495,6 +530,11 @@
<artifactId>org.scala-ide.scala.compiler</artifactId>
<version>${scala.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-ide</groupId>
+ <artifactId>org.scala-ide.sbt.full.library</artifactId>
+ <version>${sbt.version}</version>
+ </dependency>
</dependencies>
<repositories>
<repository>
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="lib" path="lib/actions_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/api_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/cache_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/classfile_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/classpath_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/collections_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/compile_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/completion_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/control_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/discovery_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/incremental-compiler_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/interface_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/io_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/ivy_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/ivy.jar"/>
+ <classpathentry kind="lib" path="lib/jline.jar"/>
+ <classpathentry kind="lib" path="lib/launcher_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/launcher-interface_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/logging_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/main_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/persist_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/precompiled-2.10.0-SNAPSHOT-2_10_0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/process_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/run_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/sbinary_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/sbt_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/task-system_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/tasks_2.10.0-SNAPSHOT.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
View
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.scala-ide.sbt</name>
+ <comment></comment>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.scala-ide.sdt.core.scalanature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Oops, something went wrong.

0 comments on commit ca6e94d

Please sign in to comment.