azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][build] KlibInstall minor fixes

Browse Source
This commit is contained in:
Pavel Punegov
2021-10-18 23:57:06 +03:00
committed by Space
parent c1ad88f1a6
commit 3abc587125
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt
+6 -6
View File
@@ -13,11 +13,11 @@ import org.jetbrains.kotlin.konan.target.HostManager
import java.io.File import java.io.File
// TODO: Implement as a part of the gradle plugin // TODO: Implement as a part of the gradle plugin
open class KlibInstall: Exec() { open class KlibInstall : Exec() {
@Input @get:InputFile
lateinit var klib: Provider<File> var klib: Provider<File> = project.provider { project.buildDir }
@Internal @get:Internal
var repo: File = project.rootDir var repo: File = project.rootDir
@get:Input @get:Input
@@ -31,13 +31,13 @@ open class KlibInstall: Exec() {
project.file("${repo.absolutePath}/$klibName") project.file("${repo.absolutePath}/$klibName")
} }
@Input @get:Input
var target: String = HostManager.hostName var target: String = HostManager.hostName
override fun configure(config: Closure<*>): Task { override fun configure(config: Closure<*>): Task {
val result = super.configure(config) val result = super.configure(config)
val konanHome = project.kotlinNativeDist val konanHome = project.kotlinNativeDist
val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else "" val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else ""
val klibProgram = "$konanHome/bin/klib$suffix" val klibProgram = "$konanHome/bin/klib$suffix"
doFirst { doFirst {