erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Simplify.

Browse source
This commit is contained in:
Cedric Beust 2015-10-30 18:18:54 -07:00
parent 24febac6c5
commit fe47e70732
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
View file

@ -39,24 +39,27 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
val errorCode = process.waitFor() val errorCode = process.waitFor()
return if (errorCode == 0) TaskResult(true, "Compilation succeeded") return if (errorCode == 0) TaskResult(true, "Compilation succeeded")
else TaskResult(false, "There were errors") else TaskResult(false, "There were errors")
} }
} }
/** /**
* Create an ICompilerAction based on the parameters and send it to JvmCompiler.doCompile(). * Create an ICompilerAction based on the parameters and send it to JvmCompiler.doCompile() with
* the given executable.
*/ */
fun compile(project: Project?, context: KobaltContext?, dependencies: List<IClasspathDependency>, private fun run(project: Project?, context: KobaltContext?, dependencies: List<IClasspathDependency>,
sourceFiles: List<String>, outputDir: File, args: List<String>) : TaskResult { sourceFiles: List<String>, outputDir: File, args: List<String>, executable: File) : TaskResult {
val info = CompilerActionInfo(dependencies, sourceFiles, outputDir, args) val info = CompilerActionInfo(dependencies, sourceFiles, outputDir, args)
val jvm = JavaInfo.create(File(SystemProperties.javaBase)) return jvmCompiler.doCompile(project, context, compilerAction(executable), info)
return jvmCompiler.doCompile(project, context, compilerAction(jvm.javacExecutable!!), info)
} }
fun compile(project: Project?, context: KobaltContext?, dependencies: List<IClasspathDependency>,
sourceFiles: List<String>, outputDir: File, args: List<String>) : TaskResult
= run(project, context, dependencies, sourceFiles, outputDir, args,
JavaInfo.create(File(SystemProperties.javaBase)).javacExecutable!!)
fun javadoc(project: Project?, context: KobaltContext?, dependencies: List<IClasspathDependency>, fun javadoc(project: Project?, context: KobaltContext?, dependencies: List<IClasspathDependency>,
sourceFiles: List<String>, outputDir: File, args: List<String>) : TaskResult { sourceFiles: List<String>, outputDir: File, args: List<String>) : TaskResult
val info = CompilerActionInfo(dependencies, sourceFiles, outputDir, args) = run(project, context, dependencies, sourceFiles, outputDir, args,
val jvm = JavaInfo.create(File(SystemProperties.javaBase)) JavaInfo.create(File(SystemProperties.javaBase)).javadocExecutable!!)
return jvmCompiler.doCompile(project, context, compilerAction(jvm.javadocExecutable!!), info)
}
} }