diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-02-10 21:42:11 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-02-10 21:42:11 +0100 |
| commit | 2a6c652b0d08809a85bd8d0ec28fa82c181c28ee (patch) | |
| tree | c2074f95a5a5948f688aa5becab945b94741ac92 | |
| parent | 8f8f81b72ef07140952aeb76120bd032e35cc918 (diff) | |
| parent | dcc455ad9ce1159fab122d677fda84132f52059d (diff) | |
| download | scala-2a6c652b0d08809a85bd8d0ec28fa82c181c28ee.tar.gz scala-2a6c652b0d08809a85bd8d0ec28fa82c181c28ee.tar.bz2 scala-2a6c652b0d08809a85bd8d0ec28fa82c181c28ee.zip | |
Merge pull request #4928 from szeiger/wip/document-e-nc
Document that `scala -e` starts/uses a compilation daemon
| -rw-r--r-- | src/compiler/scala/tools/nsc/GenericRunnerCommand.scala | 6 | ||||
| -rw-r--r-- | src/manual/scala/man1/scala.scala | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala index 2584054686..24496fa013 100644 --- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala +++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala @@ -87,7 +87,11 @@ A file argument will be run as a scala script unless it contains only self-contained compilation units (classes and objects) and exactly one runnable main method. In that case the file will be compiled and the main method invoked. This provides a bridge between scripts and standard -scala source.%n""" +scala source. + +When running a script or using -e, an already running compilation daemon +(fsc) is used, or a new one started on demand. The -nc option can be +used to prevent this.%n""" } object GenericRunnerCommand { diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala index 92d9c59cca..0fc73d2c91 100644 --- a/src/manual/scala/man1/scala.scala +++ b/src/manual/scala/man1/scala.scala @@ -65,6 +65,10 @@ object scala extends Command { "Do not use the " & MBold("fsc") & " offline compiler."), Definition( + CmdOption("nc"), + "Same as " & Mono("-nocompdaemon") & "."), + + Definition( CmdOptionBound("D", "property=value"), "Set a Java system property. If no value is specified, " & "then the property is set to the empty string."), @@ -135,6 +139,11 @@ object scala extends Command { "line. Headers can be used to make stand-alone script files, as shown " & "in the examples below.", + "When running a script or using " & Mono("-e") & ", an already running " & + "compilation daemon (fsc) is used, or a new one started on demand. The " & + Mono("-nocompdaemon") & " or " & Mono("-nc") & " option can be used to " & + "prevent this.", + "If " & Mono("scala") & " is run from an sbaz(1) directory, " & "then it will add to its classpath any jars installed in the " & "lib directory of the sbaz directory. Additionally, if no " & |