diff options
| -rw-r--r-- | example/src/main/scala/com/github/jodersky/flow/example/Main.scala (renamed from main/src/main/scala/com/github/jodersky/flow/Main.scala) | 3 | ||||
| -rw-r--r-- | project/Build.scala | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/main/src/main/scala/com/github/jodersky/flow/Main.scala b/example/src/main/scala/com/github/jodersky/flow/example/Main.scala index feea51b..f202c64 100644 --- a/main/src/main/scala/com/github/jodersky/flow/Main.scala +++ b/example/src/main/scala/com/github/jodersky/flow/example/Main.scala @@ -1,7 +1,8 @@ -package com.github.jodersky.flow +package com.github.jodersky.flow.example import scala.concurrent._ import scala.concurrent.ExecutionContext.Implicits.global +import com.github.jodersky.flow.Serial object Main { diff --git a/project/Build.scala b/project/Build.scala index bd0e655..04d82de 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -16,7 +16,7 @@ object FlowBuild extends Build { lazy val example = Project( id = "flow-example", base = file("example"), - settings = buildSettings ++ runSettings ++ Seq(libraryDependencies ++= Dependencies.all)) + settings = buildSettings ++ runSettings ++ Seq(libraryDependencies ++= Dependencies.all)).dependsOn(root) lazy val buildSettings = Defaults.defaultSettings ++ Seq( organization := Organization, @@ -35,10 +35,10 @@ object FlowBuild extends Build { linker := "gcc", linkerOptions := Seq("-shared", "-Wl,-soname,libflow.so.1"), linkerOutput <<= NativeBuild.outputDirectory(_ / "libflow.so"), + Keys.packageBin in Compile <<= (Keys.packageBin in Compile).dependsOn(NativeBuild.link), mappings in (Compile, packageBin) <+= linkerOutput map { out => out -> ("native/" + System.getProperty("os.name").toLowerCase + "/" + System.getProperty("os.arch").toLowerCase + "/libflow.so") }, - Keys.`package` in (Compile, packageBin) <<= (Keys.`package` in (Compile, packageBin)).dependsOn(NativeBuild.link), exportJars := true ) |