From 72b4cfe1dfb89d16b848c3609f182f29970b0e13 Mon Sep 17 00:00:00 2001 From: Mikhail Zinchenko Date: Wed, 22 Oct 2025 18:28:09 +0200 Subject: [PATCH] FL-34187: Add support for Python LSP resolution and uploading Adds logic to resolve basedpyright python lsp via pip from Gradle task GitOrigin-RevId: b3884aac82e396a2102df5c51fd654769ad9e594 --- .../buildtool/platform/PlatformTarget.kt | 30 +++++++++++++++++++ .../fleet/buildtool/platform/RustTarget.kt | 28 ----------------- 2 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 fleet/build/platform/srcJvmMain/fleet/buildtool/platform/PlatformTarget.kt delete mode 100644 fleet/build/platform/srcJvmMain/fleet/buildtool/platform/RustTarget.kt diff --git a/fleet/build/platform/srcJvmMain/fleet/buildtool/platform/PlatformTarget.kt b/fleet/build/platform/srcJvmMain/fleet/buildtool/platform/PlatformTarget.kt new file mode 100644 index 000000000000..d5d0ea59cada --- /dev/null +++ b/fleet/build/platform/srcJvmMain/fleet/buildtool/platform/PlatformTarget.kt @@ -0,0 +1,30 @@ +package fleet.buildtool.platform + +import java.io.Serializable + +data class PlatformTarget(val platform: Platform, val libCImplementation: LibCImplementation? = null) : Serializable { + + override fun toString(): String = platform.toString() + libCImplementation?.let { "-$it" }.orEmpty() +} + +fun PlatformTarget.toRustTargetString(): String = when (platform) { + Platform.Linux.LinuxAarch64 -> when (libCImplementation) { + LibCImplementation.GLIBC -> "aarch64-unknown-linux-gnu" + LibCImplementation.MUSL, null -> "aarch64-unknown-linux-musl" + } + + Platform.Linux.LinuxX64 -> when (libCImplementation) { + LibCImplementation.GLIBC -> "x86_64-unknown-linux-gnu" + LibCImplementation.MUSL, null -> "x86_64-unknown-linux-musl" + } + + Platform.MacOs.MacOsAarch64 -> "aarch64-apple-darwin" + Platform.MacOs.MacOsX64 -> "x86_64-apple-darwin" + Platform.Windows.WindowsAarch64 -> "aarch64-pc-windows-msvc" + Platform.Windows.WindowsX64 -> "x86_64-pc-windows-msvc" +} + +fun Platform.toPlatformTarget(overrideLibCImplementation: LibCImplementation? = null): PlatformTarget = + PlatformTarget(this, overrideLibCImplementation) + +fun PlatformTarget.toS3DistributionSlug(): String = platform.toS3DistributionSlug(libCImplementation) diff --git a/fleet/build/platform/srcJvmMain/fleet/buildtool/platform/RustTarget.kt b/fleet/build/platform/srcJvmMain/fleet/buildtool/platform/RustTarget.kt deleted file mode 100644 index c8c5ead4d273..000000000000 --- a/fleet/build/platform/srcJvmMain/fleet/buildtool/platform/RustTarget.kt +++ /dev/null @@ -1,28 +0,0 @@ -package fleet.buildtool.platform - -import java.io.Serializable - -data class RustTarget(val platform: Platform, val libCImplementation: LibCImplementation? = null) : Serializable { - - override fun toString(): String = when (platform) { - Platform.Linux.LinuxAarch64 -> when (libCImplementation) { - LibCImplementation.GLIBC -> "aarch64-unknown-linux-gnu" - LibCImplementation.MUSL, null -> "aarch64-unknown-linux-musl" - } - - Platform.Linux.LinuxX64 -> when (libCImplementation) { - LibCImplementation.GLIBC -> "x86_64-unknown-linux-gnu" - LibCImplementation.MUSL, null -> "x86_64-unknown-linux-musl" - } - - Platform.MacOs.MacOsAarch64 -> "aarch64-apple-darwin" - Platform.MacOs.MacOsX64 -> "x86_64-apple-darwin" - Platform.Windows.WindowsAarch64 -> "aarch64-pc-windows-msvc" - Platform.Windows.WindowsX64 -> "x86_64-pc-windows-msvc" - } -} - -fun Platform.toFleetRustTarget(overrideLibCImplementation: LibCImplementation? = null): RustTarget = - RustTarget(this, overrideLibCImplementation) - -fun RustTarget.toS3DistributionSlug(): String = platform.toS3DistributionSlug(libCImplementation)