diff options
author | Jakob Odersky <jodersky@gmail.com> | 2013-06-30 11:56:29 +0200 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2013-06-30 11:56:29 +0200 |
commit | 94a0ee545ab71c6779f15a5192745bedddfdb4d4 (patch) | |
tree | 208ed050a4e90490dac231d42981833f8b33b092 /project/Jni.scala | |
parent | 719978035732a55261b753bbc33570d3c1f53785 (diff) | |
download | akka-serial-94a0ee545ab71c6779f15a5192745bedddfdb4d4.tar.gz akka-serial-94a0ee545ab71c6779f15a5192745bedddfdb4d4.tar.bz2 akka-serial-94a0ee545ab71c6779f15a5192745bedddfdb4d4.zip |
solve cyclic dependency issue
Diffstat (limited to 'project/Jni.scala')
-rw-r--r-- | project/Jni.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/project/Jni.scala b/project/Jni.scala index d597269..db345e2 100644 --- a/project/Jni.scala +++ b/project/Jni.scala @@ -6,18 +6,19 @@ object Jni { val jdkHome = settingKey[File]("Home of JDK.") val javahHeaderDirectory = settingKey[File]("Directory where generated javah header files are placed.") val javahClasses = settingKey[Seq[String]]("Fully qualified names of classes containing native declarations.") + val javahClasspath = taskKey[Seq[File]]("Classpath to use in javah.") val javah = taskKey[Seq[File]]("Generate JNI headers.") val defaultSettings: Seq[Setting[_]] = Seq( jdkHome := file(sys.env("JAVA_HOME")), javahHeaderDirectory := (sourceManaged in Native).value / "javah", - javah := javahImpl.value, + javah := javahImpl.value, sourceGenerators in Native <+= javah map { headers => headers}, includeDirectories in Native += javahHeaderDirectory.value, includeDirectories in Native += jdkHome.value / "include") def javahImpl = Def.task { - val cps = (internalDependencyClasspath in Compile).value.map(_.data).map(_.getAbsolutePath) + val cps = javahClasspath.value val cp = cps.mkString(":") for (clazz <- javahClasses.value) { val parts = Seq( |