summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-01-16 16:44:44 -0800
committerJames Iry <jamesiry@gmail.com>2013-01-22 12:19:46 -0800
commite12a5b88acd80a41574d51c88a7776f99c3d2580 (patch)
tree009dfc6ef9b5d5d333afd165e668dc7a69a315b8
parent884737c75dc7f2765a3d769342ecc832deeddb81 (diff)
downloadscala-e12a5b88acd80a41574d51c88a7776f99c3d2580.tar.gz
scala-e12a5b88acd80a41574d51c88a7776f99c3d2580.tar.bz2
scala-e12a5b88acd80a41574d51c88a7776f99c3d2580.zip
SI-6987 Fixes fsc compile server verbose output
Internally the fsc server code was setting a "verbose" flag, but it was always false. Fixing that gives server's verbose output, but because the output was buffered and not flushed the server's output wasn't seen until the compile run was complete. This commit fixes the verbose flag and flushes the server side output.
-rw-r--r--src/compiler/scala/tools/nsc/CompileServer.scala3
-rw-r--r--src/compiler/scala/tools/util/SocketServer.scala2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index c23c1e6154..74118d1e20 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -92,10 +92,11 @@ class StandardCompileServer extends SocketServer {
val args = input.split("\0", -1).toList
val newSettings = new FscSettings(fscError)
- this.verbose = newSettings.verbose.value
val command = newOfflineCompilerCommand(args, newSettings)
+ this.verbose = newSettings.verbose.value
info("Settings after normalizing paths: " + newSettings)
+ if (!command.files.isEmpty) info("Input files after normalizing paths: " + (command.files mkString ","))
printMemoryStats()
// Update the idle timeout if given
diff --git a/src/compiler/scala/tools/util/SocketServer.scala b/src/compiler/scala/tools/util/SocketServer.scala
index d29a370c28..21775a01d1 100644
--- a/src/compiler/scala/tools/util/SocketServer.scala
+++ b/src/compiler/scala/tools/util/SocketServer.scala
@@ -16,7 +16,7 @@ trait CompileOutputCommon {
def verbose: Boolean
def info(msg: String) = if (verbose) echo(msg)
- def echo(msg: String) = Console println msg
+ def echo(msg: String) = {Console println msg; Console.flush}
def warn(msg: String) = System.err println msg
def fatal(msg: String) = { warn(msg) ; sys.exit(1) }
}