diff options
author | Som Snytt <som.snytt@gmail.com> | 2014-05-28 18:04:29 -0700 |
---|---|---|
committer | Som Snytt <som.snytt@gmail.com> | 2014-05-29 08:09:37 -0700 |
commit | 56e6726c0cabb075b2135ef1a71054aaf7ea6fd0 (patch) | |
tree | 911624751ddc4324f147cf8116cc1b1fa0d5d491 /src/library | |
parent | c8f8782f6a07d1cc3297f22b1798f8e2d562db88 (diff) | |
download | scala-56e6726c0cabb075b2135ef1a71054aaf7ea6fd0.tar.gz scala-56e6726c0cabb075b2135ef1a71054aaf7ea6fd0.tar.bz2 scala-56e6726c0cabb075b2135ef1a71054aaf7ea6fd0.zip |
SI-8503 -version is info setting
And the Scala runner exits with 0 for info settings.
Producing the version string is consolidated.
The compiler driver uses the default settings hook to
short-circuit on -version. That's to avoid creating
the compiler; really it should check shouldStopWithInfo
first, as the runner does.
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" |