aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-01-18 13:12:36 +0100
committerJakob Odersky <jodersky@gmail.com>2014-01-18 13:12:36 +0100
commit506e9436a6225b804fb3df9f8ce8d5cb62480106 (patch)
tree4cea9c7fac61687fc8961cee634b98fd2ea7fd5c
parentd83d7b615bb402f7ee55ccc6deab685db0e7b12e (diff)
downloadakka-serial-506e9436a6225b804fb3df9f8ce8d5cb62480106.tar.gz
akka-serial-506e9436a6225b804fb3df9f8ce8d5cb62480106.tar.bz2
akka-serial-506e9436a6225b804fb3df9f8ce8d5cb62480106.zip
add publishTo repo
-rw-r--r--flow/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala6
-rw-r--r--project/FlowBuild.scala7
-rw-r--r--project/nativefat.scala4
3 files changed, 10 insertions, 7 deletions
diff --git a/flow/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala b/flow/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala
index 034be96..7c3a2dc 100644
--- a/flow/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala
+++ b/flow/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala
@@ -24,14 +24,16 @@ object NativeLoader {
def loadFromJar() = extract() match {
case Some(file) => System.load(file.getAbsolutePath)
- case None => throw new UnsatisfiedLinkError("cannot extract native library, the native library may not exist for your specific os/architecture combination")
+ case None => throw new UnsatisfiedLinkError("Cannot extract native library, the native library may not exist for your specific os/architecture combination.")
}
def load = {
try {
System.loadLibrary("flow")
} catch {
- case ex: UnsatisfiedLinkError => loadFromJar()
+ case ex: UnsatisfiedLinkError => {
+ loadFromJar()
+ }
}
}
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 9ef9dd1..0de60bb 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -17,7 +17,7 @@ object FlowBuild extends Build {
lazy val commonSettings: Seq[Setting[_]] = Seq(
organization := Organization,
scalaVersion := ScalaVersion,
- release in ThisBuild := sys.props("release") == true,
+ release in ThisBuild := sys.props("release") == "true",
gitHeadCommitSha in ThisBuild := Process("git rev-parse HEAD").lines.head,
version in ThisBuild:= { if (release.value ) Version else Version + "-" + gitHeadCommitSha.value },
licenses := Seq(("BSD-3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))),
@@ -44,7 +44,6 @@ object FlowBuild extends Build {
settings (commonSettings: _*)
settings (JniDefaults.settings: _*)
settings (NativeDefaults.settings: _*)
- settings (NativeFatDefaults.settings: _*)
settings (selectHost().settings: _*)
settings(
nativeIncludeDirectories += (sourceDirectory in Compile).value / "native" / "include",
@@ -52,6 +51,8 @@ object FlowBuild extends Build {
javahClasses := Seq("com.github.jodersky.flow.internal.NativeSerial"),
javahHeaderDirectory := (sourceDirectory in Compile).value / "native" / "include",
compileOrder in Compile := CompileOrder.Mixed,
+ publishTo := Some("Sonatype Snapshots Nexus" at "https://oss.sonatype.org/content/repositories/snapshots"),
+ credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
libraryDependencies ++= Seq(
Dependencies.akkaActor,
Dependencies.ioCore,
@@ -74,7 +75,7 @@ object FlowBuild extends Build {
val builds = List(
NativeBuild("amd64-linux", "gcc", cFlags :+ "-m64", "gcc", linkerFlags :+ "-m64", binary),
NativeBuild("x86-linux", "gcc", cFlags :+ "-m32", "gcc", linkerFlags :+ "-m32", binary),
- NativeBuild("arm-linux", "arm-linux-gnueabi-gcc", cFlags, "arm-linux-gnueabi-gcc", linkerFlags, binary)
+ NativeBuild("arm-linux", "arm-linux-gnueabihf-gcc", cFlags, "arm-linux-gnueabihf-gcc", linkerFlags, binary)
//add other build configurations here or adapt existing ones to your needs
)
diff --git a/project/nativefat.scala b/project/nativefat.scala
index f981ba6..02de33b 100644
--- a/project/nativefat.scala
+++ b/project/nativefat.scala
@@ -17,7 +17,7 @@ object NativeFatDefaults {
val links = nativeLink.value //nativeLink produces native shared libraries for different platforms
val unamanagedDir = packageFatUnmanaged.value
- val managed: Seq[(File, String)] = for ( (build, binary) <- links.toSeq) yield {
+ val managed: Seq[(File, String)] = for ( (build, binary) <- links.toSeq) yield {
binary -> ("native/" + build.name + "/" + binary.name)
}
@@ -28,7 +28,7 @@ object NativeFatDefaults {
managed ++ unmanaged
}
- def settings = sbt.Defaults.packageTaskSettings(packageFat, sbt.Defaults.packageBinMappings) ++
+ def settings = sbt.Defaults.packageTaskSettings(packageFat, sbt.Defaults.packageBinMappings) ++
Seq(
packageFatSuffix := "-fat",
packageFatUnmanaged := baseDirectory.value / "lib_native",