erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 08:38:13 -07:00
Code Releases Activity

Fix bogus output dir.

Browse source
This commit is contained in:
Cedric Beust 2015-11-26 21:09:12 -08:00
parent 61ce1b537c
commit c19f1a4558
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -11,7 +11,6 @@ import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.FileDependency import com.beust.kobalt.maven.FileDependency
import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.IClasspathDependency
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.beust.kobalt.wrapper.ParentLastClassLoader import com.beust.kobalt.wrapper.ParentLastClassLoader
@ -43,8 +42,14 @@ class KotlinCompiler @Inject constructor(val localRepo : LocalRepo,
log(1, " Compiling ${info.sourceFiles.size} files") log(1, " Compiling ${info.sourceFiles.size} files")
} }
val cp = compilerFirst(info.dependencies.map {it.jarFile.get()}) val cp = compilerFirst(info.dependencies.map {it.jarFile.get()})
val outputDir = (info.directory ?: "") + info.outputDir
// kotlinc can accept a jar file as -d (which is super convenient) so only
// create a directory if the output is not a jar file
if (! outputDir.endsWith(".jar")) {
File(outputDir).mkdirs()
}
val allArgs : Array<String> = arrayOf( val allArgs : Array<String> = arrayOf(
"-d", KFiles.makeDir(info.directory!!, info.outputDir.path).path, "-d", outputDir,
"-classpath", cp.joinToString(File.pathSeparator), "-classpath", cp.joinToString(File.pathSeparator),
*(info.compilerArgs.toTypedArray()), *(info.compilerArgs.toTypedArray()),
*(info.sourceFiles.toTypedArray()) *(info.sourceFiles.toTypedArray())