diff options
author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:24:42 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:45:09 -0800 |
commit | c35751be33de590d8fbe669cbcb6f3de0d2c711f (patch) | |
tree | 663111a5053752abccb8aa8fefc7b03378079f36 /src | |
parent | 6ee2ce50a56237eed07bcc6b6198f97779208a02 (diff) | |
download | scala-c35751be33de590d8fbe669cbcb6f3de0d2c711f.tar.gz scala-c35751be33de590d8fbe669cbcb6f3de0d2c711f.tar.bz2 scala-c35751be33de590d8fbe669cbcb6f3de0d2c711f.zip |
Misc touchup after purging msil/fjbg/genjvm.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala | 2 | ||||
-rw-r--r-- | src/eclipse/partest/.classpath | 1 | ||||
-rw-r--r-- | src/eclipse/scala-compiler/.classpath | 1 | ||||
-rw-r--r-- | src/eclipse/scalap/.classpath | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala index ed27c1f1c8..9338d9e5b5 100644 --- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala @@ -41,7 +41,7 @@ trait StandardScalaSettings { val optimise: BooleanSetting // depends on post hook which mutates other settings val print = BooleanSetting ("-print", "Print program with Scala-specific features removed.") val target = ChoiceSetting ("-target", "target", "Target platform for object files. All JVM 1.5 targets are deprecated.", - List("jvm-1.5", "jvm-1.6", "jvm-1.7")) + List("jvm-1.5", "jvm-1.6", "jvm-1.7"), "jvm-1.6") val unchecked = BooleanSetting ("-unchecked", "Enable additional warnings where generated code depends on assumptions.") val uniqid = BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.") val usejavacp = BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.") diff --git a/src/eclipse/partest/.classpath b/src/eclipse/partest/.classpath index b14e465aa6..39a2c67f7c 100644 --- a/src/eclipse/partest/.classpath +++ b/src/eclipse/partest/.classpath @@ -8,7 +8,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/ant/ant.jar"/> <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry kind="lib" path="lib/msil.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry kind="output" path="build-quick-partest"/> </classpath> diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath index e6af46c68f..3d851de53a 100644 --- a/src/eclipse/scala-compiler/.classpath +++ b/src/eclipse/scala-compiler/.classpath @@ -7,6 +7,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/ant/ant.jar"/> <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry kind="lib" path="lib/msil.jar"/> <classpathentry kind="output" path="build-quick-compiler"/> </classpath> diff --git a/src/eclipse/scalap/.classpath b/src/eclipse/scalap/.classpath index 2b44ad19b2..3863097a65 100644 --- a/src/eclipse/scalap/.classpath +++ b/src/eclipse/scalap/.classpath @@ -7,6 +7,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/ant/ant.jar"/> <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry kind="lib" path="lib/msil.jar"/> <classpathentry kind="output" path="build-quick-scalap"/> </classpath> |