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

Use konan.home as compiler system property, kotlin.native.home as a gradle only property

Browse Source
This commit is contained in:
Pavel Punegov
2019-02-14 16:33:34 +03:00
committed by Pavel Punegov
parent 3efca3d8b8
commit 309ecbb696
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform
class ToolConfig(userProvidedTargetName: String?, flavor: 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 distribution = customerDistribution(konanHome)
private val platformManager = PlatformManager(distribution) private val platformManager = PlatformManager(distribution)
private val targetManager = platformManager.targetManager(userProvidedTargetName) private val targetManager = platformManager.targetManager(userProvidedTargetName)
backend.native/build.gradle
+2 -2
View File
@@ -207,11 +207,11 @@ task teamcityPublishStdLibSources {
// These files are built before the 'dist' is complete, // These files are built before the 'dist' is complete,
// so we provide custom values for // 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 -> targetList.each { target ->
def konanJvmArgs = [*HostManager.regularJvmArgs, def konanJvmArgs = [*HostManager.regularJvmArgs,
"-Dorg.jetbrains.kotlin.native.home=${rootProject.projectDir}", "-Dkonan.home=${rootProject.projectDir}",
"-Djava.library.path=${project.buildDir}/nativelibs/$hostName", "-Djava.library.path=${project.buildDir}/nativelibs/$hostName",
] ]
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+1 -1
View File
@@ -103,7 +103,7 @@ abstract class KonanTest extends JavaExec {
classpath = project.fileTree("$dist.canonicalPath/konan/lib/") { classpath = project.fileTree("$dist.canonicalPath/konan/lib/") {
include '*.jar' include '*.jar'
} }
jvmArgs "-Dorg.jetbrains.kotlin.native.home=${dist.canonicalPath}", "-Xmx4G", jvmArgs "-Dkonan.home=${dist.canonicalPath}", "-Xmx4G",
"-Djava.library.path=${dist.canonicalPath}/konan/nativelib" "-Djava.library.path=${dist.canonicalPath}/konan/nativelib"
enableAssertions = true enableAssertions = true
def sources = File.createTempFile(name,".lst") def sources = File.createTempFile(name,".lst")
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
+1 -1
View File
@@ -203,7 +203,7 @@ class NamedNativeInteropConfig implements Named {
new File(project.findProject(":Interop:Indexer").buildDir, "nativelibs"), new File(project.findProject(":Interop:Indexer").buildDir, "nativelibs"),
new File(project.findProject(":Interop:Runtime").buildDir, "nativelibs") new File(project.findProject(":Interop:Runtime").buildDir, "nativelibs")
).asPath ).asPath
systemProperties "org.jetbrains.kotlin.native.home": project.rootProject.projectDir systemProperties "konan.home": project.rootProject.projectDir
environment "LIBCLANG_DISABLE_CRASH_RECOVERY": "1" environment "LIBCLANG_DISABLE_CRASH_RECOVERY": "1"
outputs.dir generatedSrcDir outputs.dir generatedSrcDir
cmd/run_konan
+1 -1
View File
@@ -68,7 +68,7 @@ java_opts=(-ea \
-Xmx3G \ -Xmx3G \
-XX:TieredStopAtLevel=1 \ -XX:TieredStopAtLevel=1 \
"-Djava.library.path=${NATIVE_LIB}" \ "-Djava.library.path=${NATIVE_LIB}" \
"-Dorg.jetbrains.kotlin.native.home=${KONAN_HOME}" \ "-Dkonan.home=${KONAN_HOME}" \
-Dfile.encoding=UTF-8 \ -Dfile.encoding=UTF-8 \
${JAVA_OPTS}) ${JAVA_OPTS})
cmd/run_konan.bat
+1 -1
View File
@@ -75,7 +75,7 @@ set JAVA_OPTS=-ea ^
-Xmx3G ^ -Xmx3G ^
-XX:TieredStopAtLevel=1 ^ -XX:TieredStopAtLevel=1 ^
"-Djava.library.path=%NATIVE_LIB%" ^ "-Djava.library.path=%NATIVE_LIB%" ^
"-Dorg.jetbrains.kotlin.native.home=%_KONAN_HOME%" ^ "-Dkonan.home=%_KONAN_HOME%" ^
-Dfile.encoding=UTF-8 ^ -Dfile.encoding=UTF-8 ^
%JAVA_OPTS% %JAVA_OPTS%
klib/build.gradle
+1 -1
View File
@@ -50,7 +50,7 @@ dependencies {
test { test {
dependsOn 'cleanTest' 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') } dependsOn konanArtifacts.collect { it.getByTarget('host') }
if (useCustomDist) { if (useCustomDist) {
// Use the klib utility from the distribution // Use the klib utility from the distribution
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Distribution.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class Distribution(
private fun findKonanHome(): String { private fun findKonanHome(): String {
if (konanHomeOverride != null) return konanHomeOverride 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 val path = File(value).absolutePath
return path return path
} }
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
+1 -1
View File
@@ -68,7 +68,7 @@ internal abstract class KonanCliRunner(
} }
override val additionalSystemProperties = mutableMapOf( 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" "java.library.path" to "${project.konanHome}/konan/nativelib"
) )