From b2b59a124a2a8adf8e88c1e692c96263e0955b16 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 21 Dec 2011 12:48:39 -0800 Subject: Better hunting for tools.jar. Attempting to make the repl find it based on fewer clues so all can enjoy the javap goodness. --- src/library/scala/util/Properties.scala | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/library') 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" -- cgit v1.2.3