summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-02-03 21:59:54 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-02-03 21:59:54 +1000
commit953559988a698d6663ac983ee7d9944e05bd861d (patch)
treed2b12610d04c9a510e9d5c2b0242118521fa1a15 /project
parent6ecb997fa8eb305bf547ec8a6106ba2fd777a594 (diff)
parentbf599bc72a1fff4aa812e6d8962b2cabe14725ab (diff)
downloadscala-953559988a698d6663ac983ee7d9944e05bd861d.tar.gz
scala-953559988a698d6663ac983ee7d9944e05bd861d.tar.bz2
scala-953559988a698d6663ac983ee7d9944e05bd861d.zip
Merge commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203
Conflicts: src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
Diffstat (limited to 'project')
-rw-r--r--project/Osgi.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/project/Osgi.scala b/project/Osgi.scala
index 78370b695b..4676119076 100644
--- a/project/Osgi.scala
+++ b/project/Osgi.scala
@@ -63,6 +63,7 @@ object Osgi {
val jar = synchronized { builder.build }
builder.getWarnings.foreach(s => log.warn(s"bnd: $s"))
builder.getErrors.foreach(s => log.error(s"bnd: $s"))
+ IO.createDirectory(artifactPath.getParentFile)
jar.write(artifactPath)
artifactPath
}