diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Osgi.scala | 6 | ||||
| -rw-r--r-- | project/PartestUtil.scala | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/project/Osgi.scala b/project/Osgi.scala index 8a62c9128a..3b578572c9 100644 --- a/project/Osgi.scala +++ b/project/Osgi.scala @@ -36,12 +36,12 @@ object Osgi { ) }, jarlist := false, - bundle <<= Def.task { + bundle := Def.task { val res = (products in Compile in packageBin).value bundleTask(headers.value.toMap, jarlist.value, (products in Compile in packageBin).value, (artifactPath in (Compile, packageBin)).value, res, streams.value) - }, - packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), bundle).identityMap, + }.value, + packagedArtifact in (Compile, packageBin) := (((artifact in (Compile, packageBin)).value, bundle.value)), // Also create OSGi source bundles: packageOptions in (Compile, packageSrc) += Package.ManifestAttributes( "Bundle-Name" -> (description.value + " Sources"), diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala index 99b978515c..897881d2b6 100644 --- a/project/PartestUtil.scala +++ b/project/PartestUtil.scala @@ -86,7 +86,10 @@ object PartestUtil { srcPath = path opt + " " + path } - val P = oneOf(knownUnaryOptions.map(x => token(x))) | SrcPath | TestPathParser | Grep + + val ScalacOptsParser = (token("-Dpartest.scalac_opts=") ~ token(NotSpace)) map { case opt ~ v => opt + v } + + val P = oneOf(knownUnaryOptions.map(x => token(x))) | SrcPath | TestPathParser | Grep | ScalacOptsParser (Space ~> repsep(P, oneOrMore(Space))).map(_.mkString(" ")).?.map(_.getOrElse("")) <~ OptSpace } } |