Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '16-hseeberger'

  • Loading branch information...
commit 4ca69245bbaa03a15565f59d5bd57ed137fa350f 2 parents 95b9d0e + 34ae70e
Heiko Seeberger authored
View
4 project/build.properties
@@ -1,8 +1,8 @@
#Project properties
-#Thu Jun 17 12:51:46 CEST 2010
+#Sun Jun 20 16:04:48 CEST 2010
project.organization=com.weiglewilczek.bnd4sbt
project.name=bnd4sbt
sbt.version=0.7.4
-project.version=1.0.0.RC2
+project.version=1.0.0.RC3
build.scala.versions=2.7.7
project.initialize=false
View
3  project/build/Project.scala
@@ -2,6 +2,9 @@ import sbt._
class Project(info: ProjectInfo) extends PluginProject(info) {
+ // Compiler options
+ override def compileOptions = Unchecked :: Nil
+
// Repositories
def aquteRepo = "aQute Maven Repository" at "http://www.aqute.biz/repo"
lazy val aquteModuleConfig = ModuleConfiguration("biz.aQute", aquteRepo)
View
9 src/main/scala/BNDPlugin.scala
@@ -54,6 +54,13 @@ trait BNDPlugin extends DefaultProject with BNDPluginProperties {
private def properties = {
val properties = new Properties
+
+ // SBT packageOptions/ManifestAttributes
+ for {
+ o <- packageOptions; if o.isInstanceOf[ManifestAttributes]
+ a <- o.asInstanceOf[ManifestAttributes].attributes
+ } properties.setProperty(a._1.toString, a._2)
+
// Manifest headers
properties.setProperty(BUNDLE_SYMBOLICNAME, bndBundleSymbolicName)
properties.setProperty(BUNDLE_VERSION, bndBundleVersion)
@@ -67,10 +74,12 @@ trait BNDPlugin extends DefaultProject with BNDPluginProperties {
properties.setProperty(IMPORT_PACKAGE, bndImportPackage mkString ",")
properties.setProperty(DYNAMICIMPORT_PACKAGE, bndDynamicImportPackage mkString ",")
for { activator <- bndBundleActivator } properties.setProperty(BUNDLE_ACTIVATOR, activator)
+
// Directives
properties.setProperty(INCLUDE_RESOURCE, resourcesToBeIncluded mkString ",")
for { v <- bndVersionPolicy } properties.setProperty(VERSIONPOLICY, v)
if (bndNoUses) properties.setProperty(NOUSES, "true")
+
log debug "Using the following properties for BND: %s".format(properties)
properties
}
View
10 test/project/build/Project.scala
@@ -7,11 +7,15 @@ class TestProject(info: ProjectInfo) extends ParentProject(info: ProjectInfo) {
class A(info: ProjectInfo) extends DefaultProject(info) with BNDPlugin {
import com.weiglewilczek.bnd4sbt.ExecutionEnvironments._
override def bndBundleLicense = Some("Eclipse Public License v1.0")
- override def bndExportPackage = Set("a;version=1.0")
- override def bndBundleRequiredExecutionEnvironment = Set(Java5, Java6)
- override def bndDynamicImportPackage = Set("x.y.z")
+ override def bndExportPackage = Seq("a;version=1.0")
+ override def bndExecutionEnvironment = Set(Java5, Java6)
+ override def bndDynamicImportPackage = Seq("x.y.z")
override def bndVersionPolicy = Some("[$(@),$(@)]")
override def bndNoUses = true
+ override def packageOptions =
+ ManifestAttributes("Bundle-Name" -> "ILLEGAL") ::
+ ManifestAttributes("test" -> "TEST") ::
+ Nil
}
lazy val b = project("b", "b", new B(_), a)
View
9 test/project/plugins/Plugins.scala
@@ -1,6 +1,11 @@
import sbt._
class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
- lazy val aquteRepo = "aQute Maven Repository" at "http://www.aqute.biz/repo"
- lazy val bnd4sbt = "com.weiglewilczek" % "bnd4sbt" % "0.4"
+
+ // Repositories
+ def aquteRepo = "aQute Maven Repository" at "http://www.aqute.biz/repo"
+ lazy val aquteModuleConfig = ModuleConfiguration("biz.aQute", aquteRepo)
+
+ // Dependencies
+ lazy val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC3"
}
View
2  test/project/plugins/project/build.properties
@@ -1,3 +1,3 @@
#Project properties
-#Wed Jun 02 20:57:42 CEST 2010
+#Sun Jun 20 22:10:00 CEST 2010
plugin.uptodate=true
Please sign in to comment.
Something went wrong with that request. Please try again.