Skip to content

Find Z3 within PATH env #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoeilers merged 3 commits into from
Mar 14, 2024
Merged

Find Z3 within PATH env #818

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aff282
Extract path to Z3 from PATH env variable.
manud99 Mar 11, 2024
4bc3d92
Merge branch 'viperproject:master' into find-z3-within-path-env
manud99 Mar 14, 2024
58e7006
Use `getOrElse` instead of nested `match`.
manud99 Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/main/scala/Config.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package viper.silicon

import java.nio.file.{Path, Paths}
import java.nio.file.{Files, Path, Paths}
import scala.collection.immutable.ArraySeq
import scala.util.matching.Regex
import scala.util.Properties._
Expand Down Expand Up @@ -451,9 +451,15 @@ class Config(args: Seq[String]) extends SilFrontendConfig(args, "Silicon") {
lazy val z3Exe: String = {
val isWindows = System.getProperty("os.name").toLowerCase.startsWith("windows")

rawZ3Exe.toOption.getOrElse(
envOrNone(Z3ProverStdIO.exeEnvironmentalVariable)
.getOrElse("z3" + (if (isWindows) ".exe" else "")))
rawZ3Exe.toOption.getOrElse({
Option(System getenv Z3ProverStdIO.exeEnvironmentalVariable).getOrElse({
val filename = "z3" + (if (isWindows) ".exe" else "")
System.getenv("PATH").split(if (isWindows) ";" else ":").find(dirname => Files.exists(Paths.get(dirname, filename))) match {
case Some(dirname) => Paths.get(dirname, filename).toString
case None => filename
}
})
})
}

private val rawCvc5Exe = opt[String]("cvc5Exe",
Expand Down
⚡