From 9d1cd57430417c8923b9727542608ac34008fa27 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Wed, 15 Jan 2014 19:26:00 +0100
Subject: implement fat jar generation

---
 project/FlowBuild.scala | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'project/FlowBuild.scala')

diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index fcf4d10..9ef9dd1 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -37,12 +37,14 @@ object FlowBuild extends Build {
       publishLocal := ()
     )
   )
+
   
   lazy val flow: Project = (
     Project("flow", file("flow"))
     settings (commonSettings: _*)
     settings (JniDefaults.settings: _*)
     settings (NativeDefaults.settings: _*)
+    settings (NativeFatDefaults.settings: _*)
     settings (selectHost().settings: _*)
     settings(
       nativeIncludeDirectories += (sourceDirectory in Compile).value / "native" / "include",
@@ -56,14 +58,6 @@ object FlowBuild extends Build {
         Dependencies.ioFile)
     )
   )
-  
-  lazy val samplesTerminal = (
-    Project("flow-samples-terminal", file("flow-samples") / "flow-samples-terminal")
-    settings(commonSettings: _*)
-    settings(runSettings: _*)
-    dependsOn(flow)
-  )
-
 
   //the current operating system used to run the native compile
   trait Host{ def settings: Seq[Setting[_]] }
@@ -73,6 +67,7 @@ object FlowBuild extends Build {
     val compiler = "gcc"
     val linker = compiler
     val cFlags = Seq("-O2", "-fPIC")
+
     val linkerFlags = Seq("-shared", s"-Wl,-soname,libflow.so.${NativeMajorVersion}")
     val binary = s"libflow.so"
 
@@ -130,5 +125,15 @@ object FlowBuild extends Build {
         nativeLink := osError
       ) 
     }
-  }  
+  }
+
+
+  lazy val samplesTerminal = (
+    Project("flow-samples-terminal", file("flow-samples") / "flow-samples-terminal")
+    settings(commonSettings: _*)
+    settings(runSettings: _*)
+    dependsOn(flow)
+  )
+
+
 }
-- 
cgit v1.2.3