Misc touchup after purging msil/fjbg/genjvm.

META-INF/MANIFEST.MF

@@ -7,6 +7,7 @@ Eclipse-LazyStart: true
 Bundle-ClassPath: 
  .,
  bin,
+ lib/fjbg.jar,
  lib/jline.jar,
  lib/msil.jar
 Export-Package: 
@@ -49,6 +50,8 @@ Export-Package:
  ch.epfl.lamp.compiler.msil,
  ch.epfl.lamp.compiler.msil.emit,
  ch.epfl.lamp.compiler.msil.util,
+ ch.epfl.lamp.fjbg,
+ ch.epfl.lamp.util
 Require-Bundle: 
  org.apache.ant,
  org.scala-ide.scala.library

project/Testing.scala

@@ -17,7 +17,7 @@ trait Testing { self: ScalaBuild.type =>
     autoScalaLibrary := false
   )
   lazy val continuationsTestsuiteSettings: Seq[Setting[_]] = testsuiteSettings ++ Seq(
-    scalacOptions in Test <++= (exportedProducts in Compile in continuationsPlugin) map { 
+    scalacOptions in Test <++= (exportedProducts in Compile in continuationsPlugin) map {
      case Seq(cpDir) => Seq("-Xplugin-require:continuations", "-P:continuations:enable", "-Xplugin:"+cpDir.data.getAbsolutePath)
     },
     partestDirs <<= baseDirectory apply { bd =>
@@ -27,13 +27,13 @@ trait Testing { self: ScalaBuild.type =>
     }
   )
   val testsuite = (
-    Project("testsuite", file(".")) 
+    Project("testsuite", file("."))
     settings (testsuiteSettings:_*)
-    dependsOn (scalaLibrary, scalaCompiler, fjbg, partest, scalacheck)
+    dependsOn (scalaLibrary, scalaCompiler, partest, scalacheck)
   )
   val continuationsTestsuite = (
     Project("continuations-testsuite", file("."))
-    settings (continuationsTestsuiteSettings:_*) 
+    settings (continuationsTestsuiteSettings:_*)
     dependsOn (partest, scalaLibrary, scalaCompiler)
   )
 

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.")

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>

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>

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>

test/pending/jvm/cf-attributes.scala

@@ -52,14 +52,14 @@ object anonymousFunctions {
 }
 
 object anonymousClasses {
-  //InnerClass: 
+  //InnerClass:
   // public abstract #_= #_ of #_; //Foo=class anonymousClasses$Foo of class anonymousClasses$
   // public abstract #_= #_ of #_; //Foo$class=class anonymousClasses$Foo$class of class anonymousClasses$
   trait Foo {
     def foo() { println("foo"); }
     override def toString = getClass.getName
   }
-  //InnerClass: 
+  //InnerClass:
   // public final #_; //class anonymousClasses$$anon$1 of class anonymousClasses$
   val x = new Foo() {
     override def foo() { println("foo (overriden)"); }
@@ -88,24 +88,24 @@ trait Test1 {
 
 trait Test2 {
   @throws(classOf[Exception])
-  def printInnerClasses(cls: Class[_]) {
-    import java.io._, ch.epfl.lamp.fjbg._
-    val fjbgContext = new FJBGContext(49, 0)
-    val outDir = System.getProperty("partest.output", "cf-attributes.obj")
-    val fileName = outDir+File.separator+cls.getName+".class"
-    val in = new DataInputStream(new FileInputStream(fileName))
-    val jclass = fjbgContext.JClass(in)
-    println(jclass.getInnerClasses)
-    in.close()
-  }
+  // def printInnerClasses(cls: Class[_]) {
+  //   import java.io._, ch.epfl.lamp.fjbg._
+  //   val fjbgContext = new FJBGContext(49, 0)
+  //   val outDir = System.getProperty("partest.output", "cf-attributes.obj")
+  //   val fileName = outDir+File.separator+cls.getName+".class"
+  //   val in = new DataInputStream(new FileInputStream(fileName))
+  //   val jclass = fjbgContext.JClass(in)
+  //   println(jclass.getInnerClasses)
+  //   in.close()
+  // }
   def printClass(name: String) {
     try { printClass(Class.forName(name)) }
     catch { case e: Exception => println(e) }
   }
   def printClass(cls: Class[_]) {
     println("\n[[ "+cls.getName+" ]]");
     try { printInnerClasses(cls) }
-    catch { case e: Exception => println(e) }    
+    catch { case e: Exception => println(e) }
   }
 }