Working on jar creation infrastructure.

output generation (but only then, since otherwise we're not creating the
jar):

  1) -Xmain-class foo.Bar will give the jar a Main-Class of foo.Bar 2)
  Alternatively, if there is only one runnable program, that will be
  the Main-Class 3) Always, the jar's manifest will have an entry for
  Scala-Compiler-Version.

Not very relatedly, a warning is now issued when a module has a main
method but a runnable program will not be generated. Closes SI-4861.

This represents an opening step toward automatically recognizing
mismatched bytecode situations: coarse, but useful and safe. Review by
mirco.

1 files changed, 1 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/io/package.scala b/src/compiler/scala/tools/nsc/io/package.scala
index 2c5e50e970..d0a1d88086 100644
--- a/src/compiler/scala/tools/nsc/io/package.scala
+++ b/src/compiler/scala/tools/nsc/io/package.scala
@@ -12,14 +12,8 @@ import java.util.jar.{ Attributes }
 package object io {
   type JManifest = java.util.jar.Manifest
   type JFile = java.io.File
-  private[io] implicit def installManifestOps(m: JManifest) = new ManifestOps(m)
-
-  class ManifestOps(manifest: JManifest) {
-    def attrs                                       = manifest.getMainAttributes()
-    def apply(name: Attributes.Name)                = "" + attrs.get(name)
-    def update(key: Attributes.Name, value: String) = attrs.put(key, value)
-  }
 
+  implicit def enrichManifest(m: JManifest): Jar.WManifest = Jar.WManifest(m)
   private lazy val daemonThreadPool = DaemonThreadFactory.newPool()
 
   def runnable(body: => Unit): Runnable       = new Runnable { override def run() = body }