Replace deprecated konan.home with org.jetbrains.kotlin.native.home

This commit is contained in:
Pavel Punegov
2019-01-24 15:53:12 +03:00
committed by Pavel Punegov
parent 6e8a56f00a
commit 9c3a1332d5
18 changed files with 33 additions and 29 deletions
@@ -172,9 +172,13 @@ test {
systemProperty("kotlin.repo", kotlinCompilerRepo)
if (project.hasProperty("konan.home")) {
systemProperty("konan.home", project.property("konan.home"))
systemProperty("org.jetbrains.kotlin.native.home", project.property("konan.home"))
} else if (project.hasProperty("org.jetbrains.kotlin.native.home")) {
systemProperty("org.jetbrains.kotlin.native.home", project.property("org.jetbrains.kotlin.native.home"))
} else {
// The Koltin/Native compiler must be built before test execution.
systemProperty("konan.home", distDir.absolutePath)
systemProperty("org.jetbrains.kotlin.native.home", distDir.absolutePath)
}
if (project.hasProperty("konan.jvmArgs")) {
systemProperty("konan.jvmArgs", project.property("konan.jvmArgs"))
@@ -68,7 +68,7 @@ internal abstract class KonanCliRunner(
}
override val additionalSystemProperties = mutableMapOf(
"konan.home" to project.konanHome,
"org.jetbrains.kotlin.native.home" to project.konanHome,
"java.library.path" to "${project.konanHome}/konan/nativelib"
)
@@ -85,7 +85,7 @@ class KonanProject {
this.targets = targets
projectPath = projectDir.toPath()
konanBuildDir = projectPath.resolve('build/konan').toFile()
def konanHome = System.getProperty("konan.home")
def konanHome = System.getProperty("konan.home") ?: System.getProperty("org.jetbrains.kotlin.native.home")
if (konanHome == null) {
throw new IllegalStateException("konan.home isn't specified")
}