diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-21 12:48:39 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-30 11:19:05 -0800 |
| commit | b2b59a124a2a8adf8e88c1e692c96263e0955b16 (patch) | |
| tree | 5b6fdab06c9044e94cf697fa5b6c972f0aea098a /src/library | |
| parent | 9ae096330d07c1a865b934bb2bc978464824bd7e (diff) | |
| download | scala-b2b59a124a2a8adf8e88c1e692c96263e0955b16.tar.gz scala-b2b59a124a2a8adf8e88c1e692c96263e0955b16.tar.bz2 scala-b2b59a124a2a8adf8e88c1e692c96263e0955b16.zip | |
Better hunting for tools.jar.
Attempting to make the repl find it based on fewer clues so
all can enjoy the javap goodness.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 998661895b..22de5544a8 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -142,6 +142,11 @@ private[scala] trait PropertiesTrait { */ def isWin = osName startsWith "Windows" def isMac = javaVendor startsWith "Apple" + + // This is looking for javac, tools.jar, etc. + // Tries JDK_HOME first, then the more common but likely jre JAVA_HOME, + // and finally the system property based javaHome. + def jdkHome = envOrElse("JDK_HOME", envOrElse("JAVA_HOME", javaHome)) def versionMsg = "Scala %s %s -- %s".format(propCategory, versionString, copyrightString) def scalaCmd = if (isWin) "scala.bat" else "scala" |