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

[K/N] Don't build distribution for deprecated targets ^KT-59008

Browse Source
This commit is contained in:
Alexander Shabalin
2023-08-10 16:57:08 +02:00
committed by Space Team
parent e96dcef571
commit 18fb2ec476
5 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/konan/target/EnabledTargets.kt
+10
View File
@@ -0,0 +1,10 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.konan.target
fun enabledTargets(platformManager: PlatformManager) = platformManager.enabled.filterNot {
it in KonanTarget.deprecatedTargets && it !in KonanTarget.toleratedDeprecatedTargets
}
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/konan/target/TargetWithSanitizer.kt
+2 -2
View File
@@ -49,8 +49,8 @@ fun KonanTarget.withSanitizer(sanitizer: SanitizerKind? = null) = TargetWithSani
* All known targets with their sanitizers. * All known targets with their sanitizers.
*/ */
val PlatformManager.allTargetsWithSanitizers val PlatformManager.allTargetsWithSanitizers
get() = this.enabled.flatMap { target -> get() = enabledTargets(this).flatMap { target ->
listOf(target.withSanitizer()) + target.supportedSanitizers().map { listOf(target.withSanitizer()) + target.supportedSanitizers().map {
target.withSanitizer(it) target.withSanitizer(it)
} }
} }
kotlin-native/build.gradle
+2 -2
View File
@@ -98,8 +98,8 @@ allprojects {
void setupHostAndTarget() { void setupHostAndTarget() {
ext.hostName = platformManager.hostName ext.hostName = platformManager.hostName
ext.targetList = platformManager.enabled.collect { it.visibleName } as List ext.targetList = EnabledTargetsKt.enabledTargets(platformManager).collect { it.visibleName } as List
ext.konanTargetList = platformManager.enabled as List ext.konanTargetList = EnabledTargetsKt.enabledTargets(platformManager) as List
} }
void setupClang(Project project) { void setupClang(Project project) {
kotlin-native/dependencies/build.gradle
+1 -1
View File
@@ -75,7 +75,7 @@ enum DependencyKind {
def platformManager = rootProject.project(":kotlin-native").ext.platformManager def platformManager = rootProject.project(":kotlin-native").ext.platformManager
platformManager.enabled.each { target -> EnabledTargetsKt.enabledTargets(platformManager).each { target ->
def loader = platformManager.loader(target) def loader = platformManager.loader(target)
tasks.register("${target}Dependencies", NativeDep) { tasks.register("${target}Dependencies", NativeDep) {
kotlin-native/runtime/build.gradle.kts
-28
View File
@@ -165,8 +165,6 @@ bitcode {
} }
compilerArgs.add("-DCUSTOM_ALLOCATOR") compilerArgs.add("-DCUSTOM_ALLOCATOR")
onlyIf { target.supportsThreads() }
} }
module("opt_alloc") { module("opt_alloc") {
@@ -237,8 +235,6 @@ bitcode {
testFixtures {} testFixtures {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
module("experimental_memory_manager_custom") { module("experimental_memory_manager_custom") {
@@ -251,8 +247,6 @@ bitcode {
} }
compilerArgs.add("-DCUSTOM_ALLOCATOR") compilerArgs.add("-DCUSTOM_ALLOCATOR")
onlyIf { target.supportsThreads() }
} }
module("common_gc") { module("common_gc") {
@@ -262,8 +256,6 @@ bitcode {
main {} main {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
module("noop_gc") { module("noop_gc") {
@@ -273,8 +265,6 @@ bitcode {
main {} main {}
testFixtures {} testFixtures {}
} }
onlyIf { target.supportsThreads() }
} }
module("noop_gc_custom") { module("noop_gc_custom") {
@@ -286,8 +276,6 @@ bitcode {
} }
compilerArgs.add("-DCUSTOM_ALLOCATOR") compilerArgs.add("-DCUSTOM_ALLOCATOR")
onlyIf { target.supportsThreads() }
} }
module("same_thread_ms_gc") { module("same_thread_ms_gc") {
@@ -298,8 +286,6 @@ bitcode {
testFixtures {} testFixtures {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
module("same_thread_ms_gc_custom") { module("same_thread_ms_gc_custom") {
@@ -312,8 +298,6 @@ bitcode {
} }
compilerArgs.add("-DCUSTOM_ALLOCATOR") compilerArgs.add("-DCUSTOM_ALLOCATOR")
onlyIf { target.supportsThreads() }
} }
module("concurrent_ms_gc") { module("concurrent_ms_gc") {
@@ -324,8 +308,6 @@ bitcode {
testFixtures {} testFixtures {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
module("concurrent_ms_gc_custom") { module("concurrent_ms_gc_custom") {
@@ -338,8 +320,6 @@ bitcode {
} }
compilerArgs.add("-DCUSTOM_ALLOCATOR") compilerArgs.add("-DCUSTOM_ALLOCATOR")
onlyIf { target.supportsThreads() }
} }
module("common_gcScheduler") { module("common_gcScheduler") {
@@ -349,8 +329,6 @@ bitcode {
main {} main {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
module("manual_gcScheduler") { module("manual_gcScheduler") {
@@ -359,8 +337,6 @@ bitcode {
sourceSets { sourceSets {
main {} main {}
} }
onlyIf { target.supportsThreads() }
} }
module("adaptive_gcScheduler") { module("adaptive_gcScheduler") {
@@ -370,8 +346,6 @@ bitcode {
main {} main {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
module("aggressive_gcScheduler") { module("aggressive_gcScheduler") {
@@ -381,8 +355,6 @@ bitcode {
main {} main {}
test {} test {}
} }
onlyIf { target.supportsThreads() }
} }
testsGroup("custom_alloc_runtime_tests") { testsGroup("custom_alloc_runtime_tests") {