Jarlist scala-library in build.sbt

2 files changed, 15 insertions, 3 deletions

diff --git a/build.sbt b/build.sbt
index 984ac0e91c..da86f6274b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -351,6 +351,7 @@ lazy val library = configureAsSubproject(project)
     products in Compile in packageBin ++=
       (products in Compile in packageBin in forkjoin).value,
     Osgi.headers += "Import-Package" -> "sun.misc;resolution:=optional, *",
+    Osgi.jarlist := true,
     fixPom(
       "/project/name" -> <name>Scala Library</name>,
       "/project/description" -> <description>Standard library for the Scala Programming Language</description>,
@@ -420,13 +421,15 @@ lazy val compiler = configureAsSubproject(project)
     scalacOptions in Compile in doc ++= Seq(
       "-doc-root-content", (sourceDirectory in Compile).value + "/rootdoc.txt"
     ),
-    Osgi.headers +=
+    Osgi.headers ++= Seq(
       "Import-Package" -> ("jline.*;resolution:=optional," +
                            "org.apache.tools.ant.*;resolution:=optional," +
                            "scala.util.parsing.*;version=\"${range;[====,====];"+versionNumber("scala-parser-combinators")+"}\";resolution:=optional," +
                            "scala.xml.*;version=\"${range;[====,====];"+versionNumber("scala-xml")+"}\";resolution:=optional," +
                            "scala.*;version=\"${range;[==,=+);${ver}}\"," +
                            "*"),
+      "Class-Path" -> "scala-reflect.jar scala-library.jar"
+    ),
     // Generate the ScriptEngineFactory service definition. The ant build does this when building
     // the JAR but sbt has no support for it and it is easier to do as a resource generator:
     generateServiceProviderResources("javax.script.ScriptEngineFactory" -> "scala.tools.nsc.interpreter.IMain$Factory"),
diff --git a/project/Osgi.scala b/project/Osgi.scala
index 4456c94190..d780be2f78 100644
--- a/project/Osgi.scala
+++ b/project/Osgi.scala
@@ -1,6 +1,7 @@
 import aQute.lib.osgi.Builder
 import aQute.lib.osgi.Constants._
 import java.util.Properties
+import java.util.jar.Attributes
 import sbt._
 import sbt.Keys._
 import scala.collection.JavaConversions._
@@ -16,6 +17,7 @@ object Osgi {
   val bundleName = SettingKey[String]("osgiBundleName", "The Bundle-Name for the manifest.")
   val bundleSymbolicName = SettingKey[String]("osgiBundleSymbolicName", "The Bundle-SymbolicName for the manifest.")
   val headers = SettingKey[Seq[(String, String)]]("osgiHeaders", "Headers and processing instructions for BND.")
+  val jarlist = SettingKey[Boolean]("osgiJarlist", "List classes in manifest.")
 
   def settings: Seq[Setting[_]] = Seq(
     bundleName := description.value,
@@ -33,8 +35,9 @@ object Osgi {
         "-eclipse" -> "false"
       )
     },
+    jarlist := false,
     bundle <<= Def.task {
-      bundleTask(headers.value.toMap, (products in Compile in packageBin).value,
+      bundleTask(headers.value.toMap, jarlist.value, (products in Compile in packageBin).value,
         (artifactPath in (Compile, packageBin)).value, Nil, streams.value)
     },
     packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), bundle).identityMap,
@@ -47,7 +50,7 @@ object Osgi {
     )
   )
 
-  def bundleTask(headers: Map[String, String], fullClasspath: Seq[File], artifactPath: File,
+  def bundleTask(headers: Map[String, String], jarlist: Boolean, fullClasspath: Seq[File], artifactPath: File,
                  resourceDirectories: Seq[File], streams: TaskStreams): File = {
     val log = streams.log
     val builder = new Builder
@@ -62,6 +65,12 @@ object Osgi {
     builder.getWarnings.foreach(s => log.warn(s"bnd: $s"))
     builder.getErrors.foreach(s => log.error(s"bnd: $s"))
     IO.createDirectory(artifactPath.getParentFile)
+    if (jarlist) {
+      val entries = jar.getManifest.getEntries
+      for ((name, resource) <- jar.getResources if name.endsWith(".class")) {
+        entries.put(name, new Attributes)
+      }
+    }
     jar.write(artifactPath)
     artifactPath
   }