From 527d2c3284064bf99ebe35d3257ca15da089d4c3 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 21 May 2013 20:00:24 +0200 Subject: move previous main to example subproject --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'project/Build.scala') 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 ) -- cgit v1.2.3