Improve classpath situation, leon lib still missing though

src/main/scala/leon/Settings.scala

@@ -7,15 +7,20 @@ object Settings {
 
   var showIDs: Boolean = false
   var silentlyTolerateNonPureBodies: Boolean = false
+
+  def defaultClassPath() = {
+    val env = System.getenv("SCALA_HOME")
+    if (env != "") {
+      List(env+"/lib")
+    } else {
+      Nil
+    }
+  }
 }
 
 case class Settings(
-  val synthesis: Boolean    = false,
-  val xlang: Boolean        = false,
-  val verify: Boolean       = true,
-  val classPath: String     = 
-    List(
-      "/home/ekneuss/scala/scala-2.9.2/lib/",
-      "/home/ekneuss/git/leon-2.0/library/target/scala-2.9.2/"
-    ).mkString(":")
+  val synthesis: Boolean      = false,
+  val xlang: Boolean          = false,
+  val verify: Boolean         = true,
+  val classPath: List[String] = Settings.defaultClassPath()
 )

src/main/scala/leon/plugin/ExtractionPhase.scala

@@ -13,15 +13,7 @@ object ExtractionPhase extends LeonPhase[List[String], Program] {
 
     val settings = new NSCSettings
 
-    val scalaHome = System.getenv("SCALA_HOME")
-
-    val fullClassPath = if (scalaHome != "") {
-      scalaHome+"/lib:"+ctx.settings.classPath
-    } else {
-      ctx.settings.classPath
-    }
-
-    settings.extdirs.value = fullClassPath
+    settings.extdirs.value = ctx.settings.classPath.mkString(":")
 
     val compilerOpts = args.filterNot(_.startsWith("--"))
 

web/app/models/LeonConsole.scala

@@ -90,7 +90,7 @@ class ConsoleSession extends Actor {
       log("Welcome to LeonOnline!")
       log("Processing request...")
 
-      val classPath = Play.current.configuration.getString("app.classpath").getOrElse("")
+      val classPath = Play.current.configuration.getString("app.classpath").map(_.split(":").toList).getOrElse(Settings.defaultClassPath())
 
       mode match {
         case "verification" =>