diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt index 2f3de17d12e..5a0a7b7ff4d 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform class ToolConfig(userProvidedTargetName: String?, flavor: KotlinPlatform) { - private val konanHome = System.getProperty("org.jetbrains.kotlin.native.home") + private val konanHome = System.getProperty("konan.home") private val distribution = customerDistribution(konanHome) private val platformManager = PlatformManager(distribution) private val targetManager = platformManager.targetManager(userProvidedTargetName) diff --git a/backend.native/build.gradle b/backend.native/build.gradle index ebd81c0ab22..10f278b3174 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -207,11 +207,11 @@ task teamcityPublishStdLibSources { // These files are built before the 'dist' is complete, // so we provide custom values for -// org.jetbrains.kotlin.native.home, --runtime, -Djava.library.path etc +// konan.home, --runtime, -Djava.library.path etc targetList.each { target -> def konanJvmArgs = [*HostManager.regularJvmArgs, - "-Dorg.jetbrains.kotlin.native.home=${rootProject.projectDir}", + "-Dkonan.home=${rootProject.projectDir}", "-Djava.library.path=${project.buildDir}/nativelibs/$hostName", ] diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index 36e12a82c72..ec35a58e66b 100644 --- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -103,7 +103,7 @@ abstract class KonanTest extends JavaExec { classpath = project.fileTree("$dist.canonicalPath/konan/lib/") { include '*.jar' } - jvmArgs "-Dorg.jetbrains.kotlin.native.home=${dist.canonicalPath}", "-Xmx4G", + jvmArgs "-Dkonan.home=${dist.canonicalPath}", "-Xmx4G", "-Djava.library.path=${dist.canonicalPath}/konan/nativelib" enableAssertions = true def sources = File.createTempFile(name,".lst") diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy index 2a80cbbe72b..354e21a3c77 100644 --- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy +++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy @@ -203,7 +203,7 @@ class NamedNativeInteropConfig implements Named { new File(project.findProject(":Interop:Indexer").buildDir, "nativelibs"), new File(project.findProject(":Interop:Runtime").buildDir, "nativelibs") ).asPath - systemProperties "org.jetbrains.kotlin.native.home": project.rootProject.projectDir + systemProperties "konan.home": project.rootProject.projectDir environment "LIBCLANG_DISABLE_CRASH_RECOVERY": "1" outputs.dir generatedSrcDir diff --git a/cmd/run_konan b/cmd/run_konan index 16b723f731b..5328c6f8d95 100755 --- a/cmd/run_konan +++ b/cmd/run_konan @@ -68,7 +68,7 @@ java_opts=(-ea \ -Xmx3G \ -XX:TieredStopAtLevel=1 \ "-Djava.library.path=${NATIVE_LIB}" \ - "-Dorg.jetbrains.kotlin.native.home=${KONAN_HOME}" \ + "-Dkonan.home=${KONAN_HOME}" \ -Dfile.encoding=UTF-8 \ ${JAVA_OPTS}) diff --git a/cmd/run_konan.bat b/cmd/run_konan.bat index ce916c94fe7..8a6afdfb6f7 100644 --- a/cmd/run_konan.bat +++ b/cmd/run_konan.bat @@ -75,7 +75,7 @@ set JAVA_OPTS=-ea ^ -Xmx3G ^ -XX:TieredStopAtLevel=1 ^ "-Djava.library.path=%NATIVE_LIB%" ^ - "-Dorg.jetbrains.kotlin.native.home=%_KONAN_HOME%" ^ + "-Dkonan.home=%_KONAN_HOME%" ^ -Dfile.encoding=UTF-8 ^ %JAVA_OPTS% diff --git a/klib/build.gradle b/klib/build.gradle index 70d6efaa2c7..7b5a53d2174 100644 --- a/klib/build.gradle +++ b/klib/build.gradle @@ -50,7 +50,7 @@ dependencies { test { dependsOn 'cleanTest' - systemProperty('org.jetbrains.kotlin.native.home', getProperty("org.jetbrains.kotlin.native.home")) + systemProperty('konan.home', getProperty("org.jetbrains.kotlin.native.home")) dependsOn konanArtifacts.collect { it.getByTarget('host') } if (useCustomDist) { // Use the klib utility from the distribution diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Distribution.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Distribution.kt index 19ce71e6415..ac6ab7a651b 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Distribution.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Distribution.kt @@ -31,7 +31,7 @@ class Distribution( private fun findKonanHome(): String { if (konanHomeOverride != null) return konanHomeOverride - val value = System.getProperty("org.jetbrains.kotlin.native.home", "dist") + val value = System.getProperty("konan.home", "dist") val path = File(value).absolutePath return path } diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt index 33e555acd55..8cfa8ab94f7 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt @@ -68,7 +68,7 @@ internal abstract class KonanCliRunner( } override val additionalSystemProperties = mutableMapOf( - "org.jetbrains.kotlin.native.home" to project.konanHome, + "konan.home" to project.konanHome, "java.library.path" to "${project.konanHome}/konan/nativelib" )