luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix cavalier approach to reflection." (ClassNotFoundException) 

This reverts commit 1537a9d6b1.
This commit is contained in:
Mark Harrah 2012-04-18 03:15:14 -04:00
parent d0899419e7
commit 882ab1e4e8
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compile/JavaCompiler.scala
View File

@ -23,27 +23,17 @@ object JavaCompiler
{
type Fork = (JavacContract, Seq[String], Logger) => Int
private def pwClass = classOf[PrintWriter]
private def arrayStringClass = classOf[Array[String]]
private def docletsClass = "com.sun.tools.doclets.standard.Standard"
// The real performance gain comes if you can skip the indirection.
/* val javac = new JavacContract("javac", "com.sun.tools.javac.Main") {
def exec(args: Array[String], writer: PrintWriter): Int =
com.sun.tools.javac.Main.compile(args, writer)
} */
val javac = new JavacContract("javac", "com.sun.tools.javac.Main") {
private val execMethod = Class.forName(clazz).getDeclaredMethod("compile", arrayStringClass, pwClass)
def exec(args: Array[String], writer: PrintWriter) = {
execMethod.invoke(null, args, writer).asInstanceOf[java.lang.Integer].intValue
def exec(args: Array[String], writer: PrintWriter) = {
val m = Class.forName(clazz).getDeclaredMethod("compile", classOf[Array[String]], classOf[PrintWriter])
m.invoke(null, args, writer).asInstanceOf[java.lang.Integer].intValue
}
}
val javadoc = new JavacContract("javadoc", "com.sun.tools.javadoc.Main") {
private val execMethod = Class.forName(clazz).getDeclaredMethod("execute", classOf[String], pwClass, pwClass, pwClass, classOf[String], arrayStringClass)
def exec(args: Array[String], writer: PrintWriter) =
execMethod.invoke(null, name, writer, writer, writer, docletsClass, args).asInstanceOf[java.lang.Integer].intValue
def exec(args: Array[String], writer: PrintWriter) = {
val m = Class.forName(clazz).getDeclaredMethod("execute", classOf[String], classOf[PrintWriter], classOf[PrintWriter], classOf[PrintWriter], classOf[String], classOf[Array[String]])
m.invoke(null, name, writer, writer, writer, "com.sun.tools.doclets.standard.Standard", args).asInstanceOf[java.lang.Integer].intValue
}
}
def construct(f: Fork, cp: ClasspathOptions, scalaInstance: ScalaInstance): JavaCompiler =