diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2013-07-11 20:06:25 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2013-07-11 20:06:25 +0200 |
| commit | 2ae606b0ebc3074c3ae5d0be1cb0194c21f0333d (patch) | |
| tree | 987a7326e32e50961883240b8678b70d66bd201f /project | |
| parent | ed11af9855275aff1e0fcb6c1148c3703be0a900 (diff) | |
| download | akka-serial-2ae606b0ebc3074c3ae5d0be1cb0194c21f0333d.tar.gz akka-serial-2ae606b0ebc3074c3ae5d0be1cb0194c21f0333d.tar.bz2 akka-serial-2ae606b0ebc3074c3ae5d0be1cb0194c21f0333d.zip | |
update to sbt 0.13.0-RC1
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 20 | ||||
| -rw-r--r-- | project/build.properties | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/project/Build.scala b/project/Build.scala index b7e0da1..c68ff31 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -9,7 +9,7 @@ object FlowBuild extends Build { val Organization = "com.github.jodersky" val Version = "1.0-SNAPSHOT" //version of flow library val BinaryMajorVersion = 2 //binary major version used to select so's and dlls when publishing (needs to be incremented if API changes are made to flow.h or NativeSerial.java) - val ScalaVersion = "2.10.1" + val ScalaVersion = "2.10.2" //see native settings down below lazy val commonSettings: Seq[Setting[_]] = Seq( @@ -20,8 +20,9 @@ object FlowBuild extends Build { scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature")) lazy val runSettings: Seq[Setting[_]] = Seq( - fork := true, - connectInput in run := true) + //fork := true, + //connectInput in run := true + ) lazy val main: Project = ( Project("flow", file("flow-main")) @@ -33,7 +34,7 @@ object FlowBuild extends Build { Dependencies.ioFile), compileOrder in Compile := CompileOrder.Mixed, resourceGenerators in Compile <+= (resourceManaged in Compile, binariesDirectory in ThisBuild) map { (resDir, binDir) => -val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) + val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) val resources = for (binary <- binaries) yield { val versionedBinary = binary._1 val unversionedBinary = binary._2 @@ -75,7 +76,14 @@ val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) settings(runSettings: _*) dependsOn(main) ) - + + lazy val terminal = ( + Project("flow-samples-terminal", file("flow-samples") / "terminal") + settings(commonSettings: _*) + settings(runSettings: _*) + dependsOn(main) + ) + //--- native settings -------------------------------------------------- @@ -116,6 +124,7 @@ val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) NativeProject("flow-native-linux", file("flow-native") / "unix") settings (unixNativeSettings: _*) settings ( + target := baseDirectory.value / "target" / "linux", includeDirectories in Native += jdkHome.value / "include" / "linux", linkFlags in Native ++= Seq("-shared", s"-Wl,-soname,libflow.so.${BinaryMajorVersion}"), binaryName in Native := s"libflow.so.${BinaryMajorVersion}.${UnixBinaryMinorVersion}" @@ -127,6 +136,7 @@ val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) NativeProject("flow-native-macosx", file("flow-native") / "unix") settings (unixNativeSettings: _*) settings ( + target := baseDirectory.value / "target" / "macosx", includeDirectories in Native += file("/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"), includeDirectories in Native += file("/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers"), linkFlags in Native ++= Seq("-dynamiclib"), diff --git a/project/build.properties b/project/build.properties index 15f8ffd..5a2bed5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.0-Beta2 +sbt.version=0.13.0-RC1 |