raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Add WindowsDiscoverConfig to find JDK (#25368) (#25398)

Browse source
This commit is contained in:
Richard Imaoka 2018-07-30 23:50:22 +09:00 • committed by Konrad `ktoso` Malawski
parent 90c1f2f79b
commit e28535d4cc
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
project/CrossJava.scala
View file

@ -117,6 +117,17 @@ object CrossJava {
} }
} }
class WindowsDiscoverConfig extends JavaDiscoverConf {
val base: File = file("C://Program Files/Java")
val JavaHomeDir = """jdk-?(1\.)?([0-9]+).*""".r
def javaHomes: Vector[(String, File)] =
wrapNull(base.list())
.collect {
case dir@JavaHomeDir(m, n) => JavaVersion(nullBlank(m) + n).toString -> (base / dir)
}
}
// See https://github.com/shyiko/jabba // See https://github.com/shyiko/jabba
class JabbaDiscoverConfig extends JavaDiscoverConf { class JabbaDiscoverConfig extends JavaDiscoverConf {
val base: File = Path.userHome / ".jabba" / "jdk" val base: File = Path.userHome / ".jabba" / "jdk"
@ -137,6 +148,7 @@ object CrossJava {
new LinuxDiscoverConfig(file("/usr") / "java"), new LinuxDiscoverConfig(file("/usr") / "java"),
new LinuxDiscoverConfig(file("/usr") / "lib" / "jvm"), new LinuxDiscoverConfig(file("/usr") / "lib" / "jvm"),
new MacOsDiscoverConfig, new MacOsDiscoverConfig,
new WindowsDiscoverConfig
) )
} }