diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-05-13 12:03:14 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-05-13 12:03:14 -0700 |
| commit | 7613a55cc05a981736c25b431031efc0c6dd8278 (patch) | |
| tree | e4c517276eed4fc375c31b2d2ef6b270edc1a5ce /plugin/src/main/scala/ch | |
| parent | 63774f73abf6e2024aa062fe4d3f69923b104d5e (diff) | |
| parent | fbce71f91449b52d7caf055d2edc66d81138bb71 (diff) | |
| download | sbt-jni-7613a55cc05a981736c25b431031efc0c6dd8278.tar.gz sbt-jni-7613a55cc05a981736c25b431031efc0c6dd8278.tar.bz2 sbt-jni-7613a55cc05a981736c25b431031efc0c6dd8278.zip | |
Merge branch 'javah-classpath'
Diffstat (limited to 'plugin/src/main/scala/ch')
| -rw-r--r-- | plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala b/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala index edda1fc..eee5875 100644 --- a/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala +++ b/plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala @@ -39,7 +39,14 @@ object JniJavah extends AutoPlugin { javah := { val out = (target in javah).value - val jcp: Seq[File] = { (compile in Compile).value; Seq((classDirectory in Compile).value) } + + // fullClasspath can't be used here since it also generates resources. In + // a project combining JniJavah and JniPackage, we would have a chicken-and-egg + // problem. + val jcp: Seq[File] = (dependencyClasspath in Compile).value.map(_.data) ++ { + (compile in Compile).value; Seq((classDirectory in Compile).value) + } + val cp = jcp.mkString(sys.props("path.separator")) val log = streams.value.log |