From 04c6e6459838157c590e06f6f16e26a8bf8942d6 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 20 Oct 2021 22:52:56 +0300 Subject: [PATCH] [K/N][build] KLibInstall task fix removing useless doFirst --- .../org/jetbrains/kotlin/KLibInstall.kt | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt index dc5ae893e05..87c7acdc353 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt @@ -3,11 +3,7 @@ package org.jetbrains.kotlin import groovy.lang.Closure import org.gradle.api.Task import org.gradle.api.provider.Provider -import org.gradle.api.tasks.Exec -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.Internal -import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.* import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.HostManager import java.io.File @@ -34,21 +30,18 @@ open class KlibInstall : Exec() { @get:Input var target: String = HostManager.hostName - override fun configure(config: Closure<*>): Task { - val result = super.configure(config) + @TaskAction + override fun exec() { val konanHome = project.kotlinNativeDist val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else "" val klibProgram = "$konanHome/bin/klib$suffix" - doFirst { - repo.mkdirs() + commandLine(klibProgram, + "install", klib.get().absolutePath, + "-target", target, + "-repository", repo.absolutePath + ) - commandLine(klibProgram, - "install", klib.get().absolutePath, - "-target", target, - "-repository", repo.absolutePath - ) - } - return result + super.exec() } } \ No newline at end of file