diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2016-05-25 12:53:36 +0200 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2016-05-25 12:53:36 +0200 |
| commit | 139f6bf9d709fc18a23530f2f84afa8a1f97b464 (patch) | |
| tree | 7571f14fb6fe8304868f69d026b8ced201008ae4 /build.sbt | |
| parent | cba585d41b9c2c47f256cbce45115bb205ae58a2 (diff) | |
| parent | 206a657225f16c0fa847f0b2abaddc17b8d945d7 (diff) | |
| download | scala-139f6bf9d709fc18a23530f2f84afa8a1f97b464.tar.gz scala-139f6bf9d709fc18a23530f2f84afa8a1f97b464.tar.bz2 scala-139f6bf9d709fc18a23530f2f84afa8a1f97b464.zip | |
Merge pull request #4959 from rjolly/scripting15
Use jarlister in build
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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"), |