tweaked the -version strings

2 files changed, 20 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index deb72e9209..59691ba902 100644
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -13,8 +13,17 @@ import java.io._
  *  language Scala.
  */
 object CompileClient {
+  val PRODUCT: String =
+    System.getProperty("scala.tool.name", "scalac")
+  val VERSION: String =
+    System.getProperty("scala.tool.version", "unknown version")
+  val COPYRIGHT: String =
+    System.getProperty("scala.copyright", "(c) 2002-2006 LAMP/EPFL")
+
+  val versionMsg = PRODUCT + " " + VERSION + " -- " + COPYRIGHT
 
   var verbose = false
+  var version = false
 
   def normalize(args: Array[String]): Pair[String, String] = {
     def absFileName(path: String) = new File(path).getAbsolutePath()
@@ -40,6 +49,8 @@ object CompileClient {
         args(i) = ""
       } else if (arg == "-verbose") {
         verbose = true
+      } else if (arg == "-version") {
+        version = true
       }
       i = i + 1
       if (i < args.length) {
@@ -62,6 +73,10 @@ object CompileClient {
 
   def main(args: Array[String]): unit = {
     val Pair(vmArgs, serverAdr) = normalize(args)
+    if(version) {
+      System.out.println(versionMsg)
+      return
+    }
     if (verbose) {
       System.out.println("[Server arguments: " + args.mkString("", " ", "]"))
       System.out.println("[VM arguments: " + vmArgs + "]")
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index 61ec457824..18617cda3f 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -58,15 +58,16 @@ object MainGenericRunner {
 
     if (settings.help.value || !command.ok) {
       Console.println(command.usageMessage)
-      return ()
+      return
     }
 
     if (settings.version.value) {
       val version =
         System.getProperty("scala.tool.version", "unknown version")
-      Console.println("scala version " + version)
-      Console.println("(c) 2002-2006 LAMP/EPFL")
-      return ()
+      Console.println(
+          "Scala code runner version " + version + " -- " +
+           "(c) 2002-2006 LAMP/EPFL")
+      return
     }
 
     def paths(str: String) = str.split(File.pathSeparator).toList