diff options
author | Jakob Odersky <jodersky@gmail.com> | 2014-04-21 00:53:04 +0200 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2014-04-21 00:58:41 +0200 |
commit | 21768dcd18843620daf64fc759693385b8b6a547 (patch) | |
tree | 678799dba823b31f85d50086de07f4e8a7469848 /project/FlowBuild.scala | |
parent | 2b8d4feff9a342910192218a33fc9880abc1f33d (diff) | |
download | akka-serial-21768dcd18843620daf64fc759693385b8b6a547.tar.gz akka-serial-21768dcd18843620daf64fc759693385b8b6a547.tar.bz2 akka-serial-21768dcd18843620daf64fc759693385b8b6a547.zip |
move native build to separate sbt project
Diffstat (limited to 'project/FlowBuild.scala')
-rw-r--r-- | project/FlowBuild.scala | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index 688743b..a9aef8d 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -8,7 +8,7 @@ import NativeKeys._ object FlowBuild extends Build { val Organization = "com.github.jodersky" val ScalaVersion = "2.10.3" - val Version = "2.0.0-RC2" + val Version = "2.0.0-RC3" lazy val commonSettings: Seq[Setting[_]] = @@ -53,7 +53,7 @@ object FlowBuild extends Build { ) lazy val root: Project = ( - Project("root", file(".")).aggregate(flow) + Project("root", file(".")).aggregate(flow, flowNative) settings( publish := (), publishLocal := () @@ -62,13 +62,11 @@ object FlowBuild extends Build { lazy val flow: Project = ( Project("flow", file("flow")) - settings (commonSettings: _*) - settings (publishSettings: _*) - settings (JniDefaults.settings: _*) - settings(NativeDefaults.settings: _*) + settings(commonSettings: _*) + settings(publishSettings: _*) + settings(JniDefaults.settings: _*) settings( - nativeBuildDirectory := (baseDirectory in ThisBuild).value / "flow-native", - javahHeaderDirectory := nativeBuildDirectory.value / "src", + javahHeaderDirectory := (baseDirectory in ThisBuild).value / "flow-native" / "src", javahClasses := Seq("com.github.jodersky.flow.internal.NativeSerial"), compileOrder in Compile := CompileOrder.Mixed, libraryDependencies += Dependencies.akkaActor, @@ -77,13 +75,20 @@ object FlowBuild extends Build { ) ) + lazy val flowNative: Project = ( + Project("flow-native", file("flow-native")) + settings(publishSettings: _*) + settings(commonSettings: _*) + settings(NativeDefaults.settings: _*) + settings( + nativeBuildDirectory := (baseDirectory in ThisBuild).value / "flow-native" + ) + ) + lazy val samplesTerminal = ( Project("flow-samples-terminal", file("flow-samples") / "flow-samples-terminal") settings(commonSettings: _*) settings(runSettings: _*) - settings( - unmanagedJars in Compile += (nativePackage in flow).value - ) dependsOn(flow) ) |