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

gradle-plugin: Fix compiler downloading

Browse Source
This commit is contained in:
Ilya Matveev
2017-06-20 16:00:20 +07:00
committed by ilmat192
parent b0a531fcd1
commit 91e34017c3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompilerDownloadTask.kt
+1 -1
View File
@@ -33,7 +33,7 @@ open class KonanCompilerDownloadTask : DefaultTask() {
@TaskAction @TaskAction
fun downloadAndExtract() { fun downloadAndExtract() {
if (project.hasProperty(KonanPlugin.KONAN_HOME_PROPERTY_NAME)) { if (!project.hasProperty(KonanPlugin.DOWNLOAD_COMPILER_PROPERTY_NAME)) {
val konanHome = project.property(KonanPlugin.KONAN_HOME_PROPERTY_NAME) val konanHome = project.property(KonanPlugin.KONAN_HOME_PROPERTY_NAME)
logger.info("Use a user-defined compiler path: $konanHome") logger.info("Use a user-defined compiler path: $konanHome")
return return
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
+3
View File
@@ -191,6 +191,8 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
internal const val KONAN_BUILD_TARGETS = "konan.build.targets" internal const val KONAN_BUILD_TARGETS = "konan.build.targets"
internal const val DEFAULT_KONAN_VERSION = "0.3" internal const val DEFAULT_KONAN_VERSION = "0.3"
internal const val DOWNLOAD_COMPILER_PROPERTY_NAME = "DownloadCompiler"
} }
/** /**
@@ -219,6 +221,7 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
project.extensions.add(INTEROP_EXTENSION_NAME, KonanInteropContainer(project)) project.extensions.add(INTEROP_EXTENSION_NAME, KonanInteropContainer(project))
if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_HOME_PROPERTY_NAME)) { if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_HOME_PROPERTY_NAME)) {
project.extensions.extraProperties.set(KonanPlugin.KONAN_HOME_PROPERTY_NAME, project.konanCompilerDownloadDir()) project.extensions.extraProperties.set(KonanPlugin.KONAN_HOME_PROPERTY_NAME, project.konanCompilerDownloadDir())
project.extensions.extraProperties.set(DOWNLOAD_COMPILER_PROPERTY_NAME, true)
} }
if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_BUILD_TARGETS)) { if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_BUILD_TARGETS)) {
project.extensions.extraProperties.set(KonanPlugin.KONAN_BUILD_TARGETS, project.host) project.extensions.extraProperties.set(KonanPlugin.KONAN_BUILD_TARGETS, project.host)