diff options
author | Paul Phillips <paulp@improving.org> | 2011-02-22 05:01:06 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-02-22 05:01:06 +0000 |
commit | be9a1788b58bdf3ba70e5a39fbab2a30c082ca27 (patch) | |
tree | e4233915b40d00e7e90dcd55b3224c92e0ef52db /src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | |
parent | a7c77669bd605127c99a40ce77a70ffc382d8639 (diff) | |
download | scala-be9a1788b58bdf3ba70e5a39fbab2a30c082ca27.tar.gz scala-be9a1788b58bdf3ba70e5a39fbab2a30c082ca27.tar.bz2 scala-be9a1788b58bdf3ba70e5a39fbab2a30c082ca27.zip |
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.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 9940134b7d..16289f11d9 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -23,8 +23,10 @@ trait ScalaSettings extends AbsScalaSettings with StandardScalaSettings { /** Disable a setting */ def disable(s: Setting) = allSettings -= s - BooleanSetting("-J<flag>", "Pass <flag> directly to runtime system") - BooleanSetting("-Dprop=value", "Pass -Dprop=value directly to runtime system") + val jvmargs = MapSetting("-J<flag>", "-J", "Pass <flag> directly to the runtime system.") + val defines = MapSetting("-Dproperty=value", "-D", "Pass -Dproperty=value directly to the runtime system.") + val toolcp = PathSetting("-toolcp", "Add to the runner classpath.", "") + val nobootcp = BooleanSetting("-nobootcp", "Do not use the boot classpath for the scala jars.") /** * Standard settings |