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, 2 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
index 47d308853a..80183791ed 100644
--- a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
@@ -16,6 +16,7 @@ trait AbsScalaSettings {
   type PathSetting        <: AbsSetting { type T = String }
   type PhasesSetting      <: AbsSetting { type T = List[String] }
   type StringSetting      <: AbsSetting { type T = String }
+  type MapSetting         <: AbsSetting { type T = Map[String, String] }
 
   type OutputDirs
   type OutputSetting <: AbsSetting
@@ -28,6 +29,7 @@ trait AbsScalaSettings {
   def PathSetting(name: String, descr: String, default: String): PathSetting
   def PhasesSetting(name: String, descr: String): PhasesSetting
   def StringSetting(name: String, helpArg: String, descr: String, default: String): StringSetting
+  def MapSetting(name: String, prefix: String, descr: String): MapSetting
 
   /** **/
   abstract class SettingGroup(val prefix: String) extends AbsSetting {