Changes to startup.

default. The -toolcp option now works. -D and -J options are passed
as arguments to the runner program as well as to the underlying JVM,
because they may be needed for such things as fsc talking to a server
compiler. Added a new Settings type for -D and -J options. Deleted some
dead settings code.

There are dummy settings for -toolcp and -nobootcp so they can be seen
in the help output, which needs a big cleanup.

No review.

1 files changed, 8 insertions, 4 deletions

diff --git a/test/files/presentation/simple-tests.check b/test/files/presentation/simple-tests.check
index f3184cf457..e3d3a0c716 100644
--- a/test/files/presentation/simple-tests.check
+++ b/test/files/presentation/simple-tests.check
@@ -3,7 +3,7 @@ askTypeCompletion at Tester.scala(16,25)
 
 ================================================================================
 [response] aksTypeCompletion at (16,25)
-retreived 77 members
+retreived 75 members
 TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
 TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
 TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
@@ -67,8 +67,6 @@ TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
 TypeMember(method toString,()String,true,true,<none>)
 TypeMember(method tryToSet,(args: List[String])Some[List[String]],true,false,<none>)
 TypeMember(method tryToSetColon,(args: List[String])Option[Tester.this.settings.ResultOfTryToSet],true,true,<none>)
-TypeMember(method tryToSetFromPropertyValue,(s: String)Unit,true,false,<none>)
-TypeMember(method tryToSetProperty,(args: List[String])Option[Tester.this.settings.ResultOfTryToSet],true,true,<none>)
 TypeMember(method unparse,=> List[String],true,false,<none>)
 TypeMember(variable v,Boolean,false,false,<none>)
 TypeMember(method value,=> Tester.this.settings.verbose.T,true,true,<none>)
@@ -134,7 +132,7 @@ askTypeCompletion at Tester.scala(27,23)
 
 ================================================================================
 [response] aksTypeCompletion at (27,23)
-retreived 197 members
+retreived 203 members
 TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
 TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
 TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
@@ -156,6 +154,8 @@ TypeMember(method ChoiceSetting,(name: String,helpArg: String,descr: String,choi
 TypeMember(class IntSetting,Tester.this.settings.IntSetting,true,true,<none>)
 TypeMember(method IntSetting,(name: String,descr: String,default: Int,range: Option[(Int, Int)],parser: (String) => Option[Int])Tester.this.settings.IntSetting,true,true,<none>)
 TypeMember(trait InternalSetting,Tester.this.settings.InternalSetting,true,true,<none>)
+TypeMember(class MapSetting,Tester.this.settings.MapSetting,true,true,<none>)
+TypeMember(method MapSetting,(name: String,prefix: String,descr: String)Tester.this.settings.MapSetting,true,true,<none>)
 TypeMember(class MultiStringSetting,Tester.this.settings.MultiStringSetting,true,true,<none>)
 TypeMember(method MultiStringSetting,(name: String,arg: String,descr: String)Tester.this.settings.MultiStringSetting,true,true,<none>)
 TypeMember(class OutputDirs,Tester.this.settings.OutputDirs,true,true,<none>)
@@ -240,6 +240,7 @@ TypeMember(method copy,()scala.tools.nsc.Settings,true,true,<none>)
 TypeMember(value d,Tester.this.settings.OutputSetting,false,true,<none>)
 TypeMember(value debug,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(method debuginfo,=> Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(value defines,Tester.this.settings.MapSetting,false,true,<none>)
 TypeMember(method dependenciesFile,=> Tester.this.settings.StringSetting,true,true,<none>)
 TypeMember(value dependencyfile,Tester.this.settings.StringSetting,false,true,<none>)
 TypeMember(value deprecation,Tester.this.settings.BooleanSetting,false,true,<none>)
@@ -272,6 +273,7 @@ TypeMember(value inline,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
 TypeMember(value javabootclasspath,Tester.this.settings.PathSetting,false,true,<none>)
 TypeMember(value javaextdirs,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value jvmargs,Tester.this.settings.MapSetting,false,true,<none>)
 TypeMember(value log,Tester.this.settings.PhasesSetting,false,true,<none>)
 TypeMember(method lookupSetting,(cmd: String)Option[Tester.this.settings.Setting],true,true,<none>)
 TypeMember(value make,Tester.this.settings.ChoiceSetting,false,true,<none>)
@@ -280,6 +282,7 @@ TypeMember(value noCompletion,Tester.this.settings.BooleanSetting,false,true,<no
 TypeMember(value noForwarders,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(value noSelfCheck,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(value noassertions,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value nobootcp,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(value noimports,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(value nospecialization,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(method notify,()Unit,true,true,<none>)
@@ -319,6 +322,7 @@ TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
 TypeMember(value target,Tester.this.settings.ChoiceSetting,false,true,<none>)
 TypeMember(method toConciseString,=> String,true,true,<none>)
 TypeMember(method toString,()String,true,true,<none>)
+TypeMember(value toolcp,Tester.this.settings.PathSetting,false,true,<none>)
 TypeMember(value unchecked,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(value uniqid,Tester.this.settings.BooleanSetting,false,true,<none>)
 TypeMember(value usejavacp,Tester.this.settings.BooleanSetting,false,true,<none>)