summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/scala/tools/nsc/GenericRunnerSettings.scala')
-rw-r--r--src/compiler/scala/tools/nsc/GenericRunnerSettings.scala19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
index a7c5ce4ae1..bd0ea4a4ba 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
@@ -3,17 +3,19 @@
* @author Lex Spoon
*/
-
package scala.tools.nsc
-class GenericRunnerSettings(error: String => Unit)
-extends Settings(error) {
+class GenericRunnerSettings(error: String => Unit) extends Settings(error) {
+ // A -jar option means the remainder of the command line should be
+ // passed to the main program in the jar. If -jar is given, jarfile
+ // will be set, but we also need to prepend the jar to the classpath
+ // since it may not be there.
val jarfile =
StringSetting(
"-jar",
"jar",
"Specify the jarfile in which to look for the main class",
- "")
+ "").stopProcessing() withPostSetHook (classpath prepend _.value)
val howtorun =
ChoiceSetting(
@@ -41,8 +43,9 @@ extends Settings(error) {
"-savecompiled",
"save the compiled script (assumes the code is a script)")
- val nocompdaemon =
- BooleanSetting(
- "-nocompdaemon",
- "do not use the fsc compilation daemon")
+ val nc = BooleanSetting(
+ "-nc",
+ "do not use the fsc compilation daemon") withAbbreviation "-nocompdaemon"
+
+ @deprecated("Use `nc` instead") def nocompdaemon = nc
}