From 69748a58e483f42f29a2afa77ecc5c4393608d2d Mon Sep 17 00:00:00 2001 From: Lars Hupel Date: Sun, 20 Mar 2016 22:40:00 +0100 Subject: [PATCH] leon.base property is not needed --- build.sbt | 4 +--- src/main/scala/leon/solvers/isabelle/Component.scala | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 601d0234f..ee6223e2b 100644 --- a/build.sbt +++ b/build.sbt @@ -88,13 +88,11 @@ script := { s.log.info("Generating '"+f.getName+"' script ("+(if(is64) "64b" else "32b")+")...") } val paths = (res.getAbsolutePath +: out.getAbsolutePath +: cps.map(_.data.absolutePath)).mkString(System.getProperty("path.separator")) - val base = baseDirectory.value.getAbsolutePath IO.write(f, s"""|#!/bin/bash --posix | |SCALACLASSPATH="$paths" - |BASEDIRECTORY="$base" | - |java -Xmx2G -Xms512M -Xss64M -classpath "$${SCALACLASSPATH}" -Dleon.base="$${BASEDIRECTORY}" -Dscala.usejavacp=false scala.tools.nsc.MainGenericRunner -classpath "$${SCALACLASSPATH}" leon.Main $$@ 2>&1 | tee -i last.log + |java -Xmx2G -Xms512M -Xss64M -classpath "$${SCALACLASSPATH}" -Dscala.usejavacp=false scala.tools.nsc.MainGenericRunner -classpath "$${SCALACLASSPATH}" leon.Main $$@ 2>&1 | tee -i last.log |""".stripMargin) f.setExecutable(true) } catch { diff --git a/src/main/scala/leon/solvers/isabelle/Component.scala b/src/main/scala/leon/solvers/isabelle/Component.scala index ad73857cb..463ed8478 100644 --- a/src/main/scala/leon/solvers/isabelle/Component.scala +++ b/src/main/scala/leon/solvers/isabelle/Component.scala @@ -17,11 +17,8 @@ object Component extends LeonComponent { val name = "Isabelle" val description = "Isabelle solver" - val leonBase = - Paths.get(Option(System.getProperty("leon.base")).getOrElse(".")).toAbsolutePath() - - val platform = - Platform.guess.getOrElse(Platform.genericPlatform(leonBase.resolve("contrib").toAbsolutePath())) + def platform = + Platform.guess.getOrElse(sys.error("Unknown platform; can't run Isabelle here")) val optMapping = LeonFlagOptionDef( name = "isabelle:mapping",