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

[K/N] Fix perf build

Browse Source
This commit is contained in:
Alexander Shabalin
2023-07-17 13:31:22 +02:00
committed by Space Team
parent 1e9979a6b7
commit bdb534c3de
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/performance/swiftinterop/build.gradle.kts
+2 -1
View File
@@ -12,7 +12,8 @@ plugins {
val toolsPath = "../../tools" val toolsPath = "../../tools"
val targetExtension = "Macos" val targetExtension = "Macos"
project.extra["platformManager"] = PlatformManager(projectDir.parentFile.parentFile.absolutePath, false) // TODO: add konanDataDir to the buildDistribution after KT-50463 will be in current bootstrap
project.extra["platformManager"] = PlatformManager(buildDistribution(projectDir.parentFile.parentFile.absolutePath), false)
swiftBenchmark { swiftBenchmark {
applicationName = "swiftInterop" applicationName = "swiftInterop"
commonSrcDirs = listOf("$toolsPath/benchmarks/shared/src/main/kotlin/report", "src", "../shared/src/main/kotlin") commonSrcDirs = listOf("$toolsPath/benchmarks/shared/src/main/kotlin/report", "src", "../shared/src/main/kotlin")
native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
+10 -1
View File
@@ -20,6 +20,15 @@ class Distribution private constructor(private val serialized: Serialized) : jav
konanDataDir: String? = null konanDataDir: String? = null
) : this(Serialized(konanHome, onlyDefaultProfiles, runtimeFileOverride, propertyOverrides, konanDataDir)) ) : this(Serialized(konanHome, onlyDefaultProfiles, runtimeFileOverride, propertyOverrides, konanDataDir))
// TODO: Remove after KT-50463 will be in current bootstrap
@Deprecated("Binary compatibility until bootstrap with KT-50463", level = DeprecationLevel.HIDDEN)
constructor(
konanHome: String,
onlyDefaultProfiles: Boolean = false,
runtimeFileOverride: String? = null,
propertyOverrides: Map<String, String>? = null,
) : this(Serialized(konanHome, onlyDefaultProfiles, runtimeFileOverride, propertyOverrides, null))
val konanHome by serialized::konanHome val konanHome by serialized::konanHome
private val onlyDefaultProfiles by serialized::onlyDefaultProfiles private val onlyDefaultProfiles by serialized::onlyDefaultProfiles
private val runtimeFileOverride by serialized::runtimeFileOverride private val runtimeFileOverride by serialized::runtimeFileOverride
@@ -148,4 +157,4 @@ fun buildDistribution(konanHome: String, konanDataDir: String?) = Distribution(k
fun customerDistribution(konanHome: String) = Distribution(konanHome,false, null) fun customerDistribution(konanHome: String) = Distribution(konanHome,false, null)
fun customerDistribution(konanHome: String, konanDataDir: String?) = Distribution(konanHome,false, null, konanDataDir = konanDataDir) fun customerDistribution(konanHome: String, konanDataDir: String?) = Distribution(konanHome,false, null, konanDataDir = konanDataDir)