diff options
author | Som Snytt <som.snytt@gmail.com> | 2013-04-23 00:58:12 -0700 |
---|---|---|
committer | Som Snytt <som.snytt@gmail.com> | 2013-05-23 01:20:24 -0700 |
commit | 63bd52781faa1192de1c87028d6ac637d535a50e (patch) | |
tree | 84a0fc87f76344a1c68164763e7f4e2c25ec7acd /src/library | |
parent | 649d5bb3a59326ea8fb7790f6abc948951c73905 (diff) | |
download | scala-63bd52781faa1192de1c87028d6ac637d535a50e.tar.gz scala-63bd52781faa1192de1c87028d6ac637d535a50e.tar.bz2 scala-63bd52781faa1192de1c87028d6ac637d535a50e.zip |
SI-7410 REPL uses improved tools.jar locator
The logic in partest for snooping around for tools.jar
is moved to PathResolver, and ILoop uses it from there.
If JAVA_HOME is toolless, check out java.home.
The use case was that Ubuntu installs with `java` at
version 6 and `javac` at version 7; it's easy to wind
up with JAVA_HOME pointing at the version 6 JRE, as
I discovered. It's confusing when that happens.
In future, partest might run under 7 and fork tests
under 6, but those permutations are downstream.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/util/Properties.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index d2d473bf98..73469a955d 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -60,6 +60,8 @@ private[scala] trait PropertiesTrait { def envOrElse(name: String, alt: String) = Option(System getenv name) getOrElse alt def envOrNone(name: String) = Option(System getenv name) + def envOrSome(name: String, alt: Option[String]) = envOrNone(name) orElse alt + // for values based on propFilename def scalaPropOrElse(name: String, alt: String): String = scalaProps.getProperty(name, alt) def scalaPropOrEmpty(name: String): String = scalaPropOrElse(name, "") |