diff options
| -rw-r--r-- | .project | 11 | ||||
| -rw-r--r-- | META-INF/MANIFEST.MF | 6 | ||||
| -rw-r--r-- | build.properties | 4 | ||||
| -rwxr-xr-x | sources/scala/tools/nsc/Global.scala | 6 | ||||
| -rw-r--r-- | sources/scala/tools/nsc/backend/jvm/GenJVM.scala | 3 |
5 files changed, 27 insertions, 3 deletions
@@ -5,7 +5,18 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..e643a8035c --- /dev/null +++ b/META-INF/MANIFEST.MF @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: scala +Bundle-SymbolicName: ch.epfl.lamp.scala +Bundle-Version: 1.0.0 +Bundle-Localization: plugin diff --git a/build.properties b/build.properties new file mode 100644 index 0000000000..d19cdbcf4b --- /dev/null +++ b/build.properties @@ -0,0 +1,4 @@ +bin.includes = META-INF/,\ + distribs/unix/latest/ +bin.excludes = distribs/unix/latest/bin/,\ + distribs/unix/latest/share/nscala/bin/ diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala index 9fee761272..45a9ee2f99 100755 --- a/sources/scala/tools/nsc/Global.scala +++ b/sources/scala/tools/nsc/Global.scala @@ -80,7 +80,9 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable def error(msg: String) = reporter.error(null, msg); def warning(msg: String) = reporter.warning(null, msg); - def inform(msg: String) = reporter.info(null, msg, true); + def inform(msg: String) = System.err.println(msg); + + //reporter.info(null, msg, true); def informProgress(msg: String) = if (settings.verbose.value) inform("[" + msg + "]"); @@ -121,7 +123,7 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable settings.extdirs.value); if (settings.verbose.value) { - System.out.println("classpath = " + classPath); + System.err.println("classpath = " + classPath); } def getSourceFile(f: AbstractFile): SourceFile = diff --git a/sources/scala/tools/nsc/backend/jvm/GenJVM.scala b/sources/scala/tools/nsc/backend/jvm/GenJVM.scala index aa6e46d263..c8e5f72cd0 100644 --- a/sources/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/sources/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -91,7 +91,8 @@ abstract class GenJVM extends SubComponent { addScalaAttr(if (isTopLevelModule(sym)) sym.sourceModule else sym); val outfile = getFile(jclass, ".class"); jclass.writeTo(outfile); - informProgress("wrote " + outfile); + val file = scala.tools.util.AbstractFile.getFile(outfile); + informProgress("wrote " + outfile + " " + (if (file != null) "" + file.getFile() + " " + file.getFile().exists() else "no file")); } var serialVUID: Option[Long] = None; |