diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-06-10 11:40:35 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-06-10 11:40:35 +0200 |
| commit | 0ba6d1c6d93079750cbccbdfeb5340287b7fb8c6 (patch) | |
| tree | 86ebeea8ab2ac9c14655a6396c590977ffdce971 /src/library | |
| parent | d2b6eedb9d70835c85616998d784b1608aa9e8ef (diff) | |
| parent | 56e6726c0cabb075b2135ef1a71054aaf7ea6fd0 (diff) | |
| download | scala-0ba6d1c6d93079750cbccbdfeb5340287b7fb8c6.tar.gz scala-0ba6d1c6d93079750cbccbdfeb5340287b7fb8c6.tar.bz2 scala-0ba6d1c6d93079750cbccbdfeb5340287b7fb8c6.zip | |
Merge pull request #3800 from som-snytt/issue/8503
SI-8503 -version is info setting
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index d597feb898..2daa4de9a6 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -155,9 +155,12 @@ private[scala] trait PropertiesTrait { // 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 jdkHome = envOrElse("JDK_HOME", envOrElse("JAVA_HOME", javaHome)) - def versionMsg = "Scala %s %s -- %s".format(propCategory, versionString, copyrightString) + // private[scala] for 2.12 + private[this] def versionFor(command: String) = f"Scala $command $versionString -- $copyrightString" + + def versionMsg = versionFor(propCategory) def scalaCmd = if (isWin) "scala.bat" else "scala" def scalacCmd = if (isWin) "scalac.bat" else "scalac" |