From fbce71f91449b52d7caf055d2edc66d81138bb71 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Fri, 13 May 2016 11:31:56 -0700 Subject: Add scala classpath to javah --- plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniJavah.scala | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'plugin/src/main/scala') 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 -- cgit v1.2.3