Leon now works again on Windows.

epfl-lara · May 1, 2016 · da6264d · da6264d
1 parent 6180419
commit da6264d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -22,12 +22,18 @@ site.settings
 
 site.sphinxSupport()
 
-if(System.getProperty("sun.arch.data.model") == "64") {
-  unmanagedBase <<= baseDirectory { base => base / "unmanaged" / "64" }
+val osName = Option(System.getProperty("os.name")).getOrElse("").toLowerCase()
+
+val osArch = System.getProperty("sun.arch.data.model")
+
+if(osName.indexOf("win") != -1) {
+  (unmanagedJars in Compile) += baseDirectory.value / "unmanaged" / s"scalaz3-win-$osArch.jar"
 } else {
-  unmanagedBase <<= baseDirectory { base => base / "unmanaged" / "32" }
+  (unmanagedJars in Compile) += baseDirectory.value / "unmanaged" / s"scalaz3-unix-$osArch.jar"
 }
 
+unmanagedBase <<= baseDirectory { base => base / "unmanaged" / osArch }
+
 resolvers ++= Seq(
   "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
   "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",

diff --git a/unmanaged/32/scalaz3_2.10-2.0.jar → unmanaged/scalaz3-unix-32.jar b/unmanaged/32/scalaz3_2.10-2.0.jar → unmanaged/scalaz3-unix-32.jar
diff --git a/unmanaged/64/scalaz3_2.11-3.0.jar → unmanaged/scalaz3-unix-64.jar b/unmanaged/64/scalaz3_2.11-3.0.jar → unmanaged/scalaz3-unix-64.jar
diff --git a/unmanaged/scalaz3-win-64.jar b/unmanaged/scalaz3-win-64.jar