aboutsummaryrefslogtreecommitdiff
path: root/project/jni.scala
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-04-15 23:52:40 +0200
committerJakob Odersky <jodersky@gmail.com>2014-04-15 23:52:40 +0200
commit975a07373e4ffe5ff269675bc8da896e60f84427 (patch)
treeefd7c87b086c1a8a5643b3939b50086b1ae05f01 /project/jni.scala
parent416aacf8940ba0f281a3d7afb90f27b3ae99e664 (diff)
downloadakka-serial-975a07373e4ffe5ff269675bc8da896e60f84427.tar.gz
akka-serial-975a07373e4ffe5ff269675bc8da896e60f84427.tar.bz2
akka-serial-975a07373e4ffe5ff269675bc8da896e60f84427.zip
reorganize build
Diffstat (limited to 'project/jni.scala')
-rw-r--r--project/jni.scala4
1 files changed, 1 insertions, 3 deletions
diff --git a/project/jni.scala b/project/jni.scala
index e87f0c7..6686078 100644
--- a/project/jni.scala
+++ b/project/jni.scala
@@ -3,7 +3,6 @@ import Keys._
import scala.util.Try
object JniKeys {
- val jdkHome = settingKey[Option[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.")
@@ -14,7 +13,6 @@ object JniDefaults {
import JniKeys._
val settings: Seq[Setting[_]] = Seq(
- jdkHome := Try(file(sys.env("JAVA_HOME"))).toOption,
javahHeaderDirectory := baseDirectory.value,
javahClasspath := Seq((classDirectory in Compile).value),
javah := javahImpl.value
@@ -22,7 +20,7 @@ object JniDefaults {
def javahImpl = Def.task {
val jcp = javahClasspath.value
- val cp = jcp.mkString(":")
+ val cp = jcp.mkString(sys.props("path.separator"))
for (clazz <- javahClasses.value) {
val parts = Seq(
"javah",