From 60726ed5ee030cbe925dee363170d67a1aba176b Mon Sep 17 00:00:00 2001
From: Mirco Dotta <mirco.dotta@typesafe.com>
Date: Tue, 13 Aug 2013 16:02:17 +0200
Subject: [PATCH] Added a source bundle for the sbt library.

This commit allows debugging, hyperlinking, etc. towards
sbt sources. Useful when working on the Sbt builder.

* create a source bundle for the sbt library. I needed to
  inline the contents of sbt jars in order to get Eclipse
  to correctly associate sources with classfiles

* created a new compiler.interface bundle, only for the
  compiler interface, together with the matching
  `compiler.interface.sources` bundle. Sbt requires this to
  be a separate jar and there was no way to build a single sbt
  bundle with only some of the dependencies inlined.

A similar approach could be used for the Scala library/compiler
bundles, but we should investigate the possibility of having the
Scala team publish source bundles too (Re #1001889).

(this was originally a commit from @dragos, which I have adapted
based on the comments in https://github.com/scala-ide/scala-ide/pull/482)

Fixes #1001888
---
 .gitignore                                    |   1 +
 org.scala-ide.build-toolchain/pom.xml         |  15 +-
 .../pom.xml                                   |  63 ++++++
 org.scala-ide.sbt.compiler.interface/pom.xml  |  62 ++++++
 org.scala-ide.sbt.full.library.source/pom.xml | 189 ++++++++++++++++++
 org.scala-ide.sbt.full.library/pom.xml        |  30 +--
 org.scala-ide.sdt.build/pom.xml               |  15 ++
 org.scala-ide.sdt.core/META-INF/MANIFEST.MF   |   1 +
 .../src/scala/tools/eclipse/ScalaPlugin.scala |   4 +-
 org.scala-ide.sdt.feature/feature.xml         |   7 +
 org.scala-ide.sdt.source.feature/feature.xml  |  14 ++
 11 files changed, 374 insertions(+), 27 deletions(-)
 create mode 100644 org.scala-ide.sbt.compiler.interface.source/pom.xml
 create mode 100644 org.scala-ide.sbt.compiler.interface/pom.xml
 create mode 100644 org.scala-ide.sbt.full.library.source/pom.xml

diff --git a/.gitignore b/.gitignore
index 8a3d5600f3..4c7889b424 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 **/.cache
+target/
diff --git a/org.scala-ide.build-toolchain/pom.xml b/org.scala-ide.build-toolchain/pom.xml
index 652d283482..af9a9484f6 100644
--- a/org.scala-ide.build-toolchain/pom.xml
+++ b/org.scala-ide.build-toolchain/pom.xml
@@ -7,15 +7,28 @@
     <artifactId>org.scala-ide.build</artifactId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
-  
+
   <artifactId>org.scala-ide.build-toolchain</artifactId>
   <description>The Scala Toolchain for Scala Eclipse plugins</description>
   <packaging>pom</packaging>
   <version>4.0.0-SNAPSHOT</version>
 
+
+  <!-- extra repository containing the sbt packages -->
+  <repositories>
+    <repository>
+      <id>typesafe-ide</id>
+      <name>Typesafe IDE repository</name>
+      <url>${repo.typesafe}</url>
+    </repository>
+  </repositories>
+
   <modules>
     <module>../org.scala-ide.scala.library</module>
     <module>../org.scala-ide.scala.compiler</module>
     <module>../org.scala-ide.sbt.full.library</module>
+    <module>../org.scala-ide.sbt.full.library.source</module>
+    <module>../org.scala-ide.sbt.compiler.interface</module>
+    <module>../org.scala-ide.sbt.compiler.interface.source</module>
   </modules>
 </project>
diff --git a/org.scala-ide.sbt.compiler.interface.source/pom.xml b/org.scala-ide.sbt.compiler.interface.source/pom.xml
new file mode 100644
index 0000000000..33e9541998
--- /dev/null
+++ b/org.scala-ide.sbt.compiler.interface.source/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.scala-ide</groupId>
+    <artifactId>org.scala-ide.build-toolchain</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
+  </parent>
+  <artifactId>org.scala-ide.sbt.compiler.interface.source</artifactId>
+  <packaging>bundle</packaging>
+
+  <profiles>
+    <profile>
+      <id>sbt-new</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.typesafe.sbt</groupId>
+          <artifactId>compiler-interface-precompiled</artifactId>
+          <version>${sbt.ide.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>sbt-legacy</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>compiler-interface_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <!-- generate the MANIFEST.MF file, and create the bundle -->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.build.directory}/src</outputDirectory>
+          <instructions>
+            <Bundle-Name>Sbt Compiler Interface Sources for Eclipse</Bundle-Name>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Version>${sbt.version}.${version.tag}-${version.suffix}-${maven.build.timestamp}</Bundle-Version>
+            <!-- This defines the bundle we provide the source for -->
+            <Eclipse-SourceBundle>org.scala-ide.sbt.compiler.interface;version="${sbt.version}.${version.tag}-${version.suffix}-${maven.build.timestamp}";roots:="."</Eclipse-SourceBundle>
+            <!-- Extract all sources into this bundle -->
+            <Embed-Dependency>classifier=sources;inline=true</Embed-Dependency>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/org.scala-ide.sbt.compiler.interface/pom.xml b/org.scala-ide.sbt.compiler.interface/pom.xml
new file mode 100644
index 0000000000..1280e45599
--- /dev/null
+++ b/org.scala-ide.sbt.compiler.interface/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.scala-ide</groupId>
+    <artifactId>org.scala-ide.build-toolchain</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
+  </parent>
+  <artifactId>org.scala-ide.sbt.compiler.interface</artifactId>
+  <packaging>bundle</packaging>
+
+  <profiles>
+    <profile>
+      <id>sbt-new</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.typesafe.sbt</groupId>
+          <artifactId>compiler-interface-precompiled</artifactId>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>sbt-legacy</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>compiler-interface_${sbt.compiled.version}</artifactId>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <!-- generate the MANIFEST.MF file, and create the bundle -->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.build.directory}/lib</outputDirectory>
+          <instructions>
+            <Bundle-Vendor>scala-ide.org</Bundle-Vendor>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Sbt ${sbt.ide.version} Compiler Interface for Eclipse</Bundle-Name>
+            <!-- put a '-' after the sbt.version since it already has a '-scalaide-01' qualifier. Remove it the qualifier is gone. -->
+            <Bundle-Version>${sbt.version}.${version.tag}-${version.suffix}-${maven.build.timestamp}</Bundle-Version>
+            <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
+            <_exportcontents>xsbt.*;version=${sbt.version}</_exportcontents>
+            <Embed-StripVersion>true</Embed-StripVersion>
+            <Import-Package>!org.apache.ivy.*,!org.bouncycastle.*,!org.scalatools.testing.*,!com.craft.*,!com.jcraft.*,!sun.misc,!org.apache.commons.vfs,!org.apache.commons.vfs.impl,!org.apache.oro.text,!org.apache.oro.text
+ .regex,*</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/org.scala-ide.sbt.full.library.source/pom.xml b/org.scala-ide.sbt.full.library.source/pom.xml
new file mode 100644
index 0000000000..ea8cde224d
--- /dev/null
+++ b/org.scala-ide.sbt.full.library.source/pom.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.scala-ide</groupId>
+    <artifactId>org.scala-ide.build-toolchain</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <relativePath>../org.scala-ide.build-toolchain/pom.xml</relativePath>
+  </parent>
+  <artifactId>org.scala-ide.sbt.full.library.source</artifactId>
+  <packaging>bundle</packaging>
+
+  <profiles>
+    <profile>
+      <id>sbt-new</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.typesafe.sbt</groupId>
+          <artifactId>sbt-interface</artifactId>
+          <version>${sbt.ide.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>com.typesafe.sbt</groupId>
+          <artifactId>incremental-compiler</artifactId>
+          <version>${sbt.ide.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>sbt-legacy</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>classpath_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>logging_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>io_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>control_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>classfile_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>process_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>relation_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>interface_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>persist_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>api_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>compiler-integration_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>incremental-compiler_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.scala-sbt</groupId>
+          <artifactId>compile_${sbt.compiled.version}</artifactId>
+          <version>${sbt.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <!-- all the dependencies necessary for running like sbinary, jline -->
+        <dependency>
+          <groupId>jline</groupId>
+          <artifactId>jline</artifactId>
+          <version>${jline.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <!-- No published sources for sbinary, yet -->
+<!--        <dependency>
+          <groupId>org.scala-tools.sbinary</groupId>
+          <artifactId>sbinary_${sbt.compiled.version}</artifactId>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+-->
+      </dependencies>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <!-- automatically clean up the generated META-INF folder -->
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <excludeDefaultDirectories>true</excludeDefaultDirectories>
+          <filesets>
+            <fileset>
+              <directory>./</directory>
+              <includes>
+                <include>META-INF/**/*</include>
+                <include>META-INF</include>
+                <include>target/**/*</include>
+                <include>target</include>
+              </includes>
+              <followSymlinks>false</followSymlinks>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.build.directory}/src</outputDirectory>
+          <instructions>
+            <Bundle-Vendor>scala-ide.org</Bundle-Vendor>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>Sbt ${sbt.ide.version} Library Sources for Eclipse</Bundle-Name>
+            <Bundle-Version>${sbt.version}.${version.tag}-${version.suffix}-${maven.build.timestamp}</Bundle-Version>
+            <!-- This defines the bundle we provide the source for -->
+            <Eclipse-SourceBundle>org.scala-ide.sbt.full.library;version="${sbt.version}.${version.tag}-${version.suffix}-${maven.build.timestamp}";roots:="."</Eclipse-SourceBundle>
+            <!-- Extract all sources into this bundle -->
+            <Embed-Dependency>classifier=sources;inline=true</Embed-Dependency>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/org.scala-ide.sbt.full.library/pom.xml b/org.scala-ide.sbt.full.library/pom.xml
index bf41b1a565..db44559be9 100644
--- a/org.scala-ide.sbt.full.library/pom.xml
+++ b/org.scala-ide.sbt.full.library/pom.xml
@@ -11,15 +11,6 @@
   <artifactId>org.scala-ide.sbt.full.library</artifactId>
   <packaging>bundle</packaging>
 
-  <!-- extra repository containing the sbt packages -->
-  <repositories>
-    <repository>
-      <id>typesafe-ide</id>
-      <name>Typesafe IDE repository</name>
-      <url>${repo.typesafe}</url>
-    </repository>
-  </repositories>
-
   <profiles>
     <profile>
       <!--- the profile using the default values. Scala 2.10.x -->
@@ -48,11 +39,6 @@
           <artifactId>sbt-interface</artifactId>
           <optional>true</optional>
         </dependency>
-        <dependency>
-          <groupId>com.typesafe.sbt</groupId>
-          <artifactId>compiler-interface-precompiled</artifactId>
-          <optional>true</optional>
-        </dependency>
         <dependency>
           <groupId>com.typesafe.sbt</groupId>
           <artifactId>incremental-compiler</artifactId>
@@ -129,11 +115,6 @@
           <artifactId>compile_${sbt.compiled.version}</artifactId>
           <optional>true</optional>
         </dependency>
-        <dependency>
-          <groupId>org.scala-sbt</groupId>
-          <artifactId>compiler-interface_${sbt.compiled.version}</artifactId>
-          <optional>true</optional>
-        </dependency>
         <!-- all the dependencies necessary for running like sbinary, jline -->
         <dependency>
           <groupId>jline</groupId>
@@ -161,8 +142,6 @@
             <fileset>
               <directory>./</directory>
               <includes>
-                <include>lib/**/*</include>
-                <include>lib</include>
                 <include>META-INF/**/*</include>
                 <include>META-INF</include>
                 <include>target/**/*</include>
@@ -178,14 +157,15 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
+          <outputDirectory>${project.build.directory}/lib</outputDirectory>
           <manifestLocation>${basedir}/META-INF</manifestLocation>
           <instructions>
+            <Bundle-Vendor>scala-ide.org</Bundle-Vendor>
             <Bundle-SymbolicName>org.scala-ide.sbt.full.library</Bundle-SymbolicName>
-            <Bundle-Name>Sbt ${sbt.version} Library for Eclipse</Bundle-Name>
-            <Bundle-Version>${sbt.version}-${version.suffix}-${maven.build.timestamp}</Bundle-Version>
-            <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
+            <Bundle-Name>Sbt ${sbt.ide.version} Library for Eclipse</Bundle-Name>
+            <Bundle-Version>${sbt.version}.${version.tag}-${version.suffix}-${maven.build.timestamp}</Bundle-Version>
+            <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
             <_exportcontents>sbt.*;version=${sbt.version},xsbt.*;version=${sbt.version},xsbti.*;version=${sbt.version},sbinary.*;version=${sbt.version}</_exportcontents>
-            <Embed-Directory>lib</Embed-Directory>
             <Embed-StripVersion>true</Embed-StripVersion>
             <Import-Package>!org.apache.ivy.*,!org.bouncycastle.*,!org.scalatools.testing.*,!com.craft.*,!com.jcraft.*,!sun.misc,!org.apache.commons.vfs,!org.apache.commons.vfs.impl,!org.apache.oro.text,!org.apache.oro.text
  .regex,*</Import-Package>
diff --git a/org.scala-ide.sdt.build/pom.xml b/org.scala-ide.sdt.build/pom.xml
index 3edeef832d..73cb902bb0 100644
--- a/org.scala-ide.sdt.build/pom.xml
+++ b/org.scala-ide.sdt.build/pom.xml
@@ -90,6 +90,21 @@
       <artifactId>org.scala-ide.sbt.full.library</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.scala-ide</groupId>
+      <artifactId>org.scala-ide.sbt.full.library.source</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-ide</groupId>
+      <artifactId>org.scala-ide.sbt.compiler.interface</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-ide</groupId>
+      <artifactId>org.scala-ide.sbt.compiler.interface.source</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
 
diff --git a/org.scala-ide.sdt.core/META-INF/MANIFEST.MF b/org.scala-ide.sdt.core/META-INF/MANIFEST.MF
index 989712efd3..b890dde89c 100644
--- a/org.scala-ide.sdt.core/META-INF/MANIFEST.MF
+++ b/org.scala-ide.sdt.core/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Require-Bundle:
  org.scala-ide.scala.compiler,
  org.scala-refactoring.library,
  org.scala-ide.sbt.full.library;bundle-version="[0.13,0.14)",
+ org.scala-ide.sbt.compiler.interface;bundle-version="[0.13,0.14)",
  scalariform,
  org.eclipse.ui.browser;bundle-version="3.3.0"
 Import-Package: 
diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala
index 0cca9d707d..7b0f3fe8b7 100644
--- a/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala
+++ b/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala
@@ -109,6 +109,7 @@ class ScalaPlugin extends AbstractUIPlugin with PluginLogConfigurator with IReso
   def compilerPluginId = "org.scala-ide.scala.compiler"
   def libraryPluginId = "org.scala-ide.scala.library"
   def sbtPluginId = "org.scala-ide.sbt.full.library"
+  def sbtCompilerInterfaceId = "org.scala-ide.sbt.compiler.interface"
 
   def wizardPath = pluginId + ".wizards"
   def wizardId(name: String) = wizardPath + ".new" + name
@@ -189,7 +190,8 @@ class ScalaPlugin extends AbstractUIPlugin with PluginLogConfigurator with IReso
   }
 
   lazy val sbtCompilerBundle = Platform.getBundle(sbtPluginId)
-  lazy val sbtCompilerInterface = allPathsInBundle(sbtCompilerBundle, "/lib", "compiler-interface*.jar").toIterable.headOption
+  lazy val sbtCompilerInterfaceBundle = Platform.getBundle(sbtCompilerInterfaceId)
+  lazy val sbtCompilerInterface = pathInBundle(sbtCompilerInterfaceBundle, "/")
   // Disable for now, until we introduce a way to have multiple scala libraries, compilers available for the builder
   //lazy val sbtScalaLib = pathInBundle(sbtCompilerBundle, "/lib/scala-" + shortScalaVer + "/lib/scala-library.jar")
   //lazy val sbtScalaCompiler = pathInBundle(sbtCompilerBundle, "/lib/scala-" + shortScalaVer + "/lib/scala-compiler.jar")
diff --git a/org.scala-ide.sdt.feature/feature.xml b/org.scala-ide.sdt.feature/feature.xml
index f150e631d9..c18003a38a 100644
--- a/org.scala-ide.sdt.feature/feature.xml
+++ b/org.scala-ide.sdt.feature/feature.xml
@@ -138,4 +138,11 @@ SUCH DAMAGE.
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.scala-ide.sbt.compiler.interface"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.scala-ide.sdt.source.feature/feature.xml b/org.scala-ide.sdt.source.feature/feature.xml
index 8fecbb7594..02b215afdf 100644
--- a/org.scala-ide.sdt.source.feature/feature.xml
+++ b/org.scala-ide.sdt.source.feature/feature.xml
@@ -64,6 +64,20 @@ SUCH DAMAGE.
     version="0.0.0"
     unpack="false"/>
 
+  <plugin
+    id="org.scala-ide.sbt.full.library.source"
+    download-size="0"
+    install-size="0"
+    version="0.0.0"
+    unpack="false"/>
+
+  <plugin
+    id="org.scala-ide.sbt.compiler.interface.source"
+    download-size="0"
+    install-size="0"
+    version="0.0.0"
+    unpack="false"/>
+
   <plugin
     id="org.scala-ide.sdt.debug.source"
     download-size="0"