Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring JVM target determination + adding arm64 support for windows #281

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Refactoring JVM target determination + adding arm64 support for windows #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/publish-jvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ jobs:
os: windows-2019,
build-cmd: "cargo",
}
- {
target: aarch64-pc-windows-msvc,
arch: arm64,
os: windows-2019,
build-cmd: "cargo",
}
steps:
- name: Checkout source code
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions zenoh-kotlin/src/jvmMain/kotlin/io/zenoh/Target.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package io.zenoh

internal enum class Target {
WINDOWS_X86_64_MSVC,
WINDOWS_AARCH64_MSVC,
LINUX_X86_64,
LINUX_AARCH64,
APPLE_AARCH64,
Expand All @@ -24,6 +25,7 @@ internal enum class Target {
override fun toString(): String {
return when (this) {
WINDOWS_X86_64_MSVC -> "x86_64-pc-windows-msvc"
WINDOWS_AARCH64_MSVC -> "aarch64-pc-windows-msvc"
LINUX_X86_64 -> "x86_64-unknown-linux-gnu"
LINUX_AARCH64 -> "aarch64-unknown-linux-gnu"
APPLE_AARCH64 -> "aarch64-apple-darwin"
Expand Down
27 changes: 17 additions & 10 deletions zenoh-kotlin/src/jvmMain/kotlin/io/zenoh/Zenoh.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,31 @@ internal actual object ZenohLoad {
*/
private fun determineTarget(): Result<Target> = runCatching {
val osName = System.getProperty("os.name").lowercase()
val osArch = System.getProperty("os.arch")
val osArch = System.getProperty("os.arch").lowercase()

val target = when {
osName.contains("win") -> when {
osArch.contains("x86_64") || osArch.contains("amd64") -> Target.WINDOWS_X86_64_MSVC
else -> throw UnsupportedOperationException("Unsupported architecture: $osArch")
osArch.contains("x86_64") || osArch.contains("amd64") || osArch.contains("x64") ->
Target.WINDOWS_X86_64_MSVC
osArch.contains("aarch64") || osArch.contains("arm64") ->
Target.WINDOWS_AARCH64_MSVC
else -> throw UnsupportedOperationException("Unsupported architecture on Windows: $osArch")
}

osName.contains("mac") -> when {
osArch.contains("x86_64") || osArch.contains("amd64") -> Target.APPLE_X86_64
osArch.contains("aarch64") -> Target.APPLE_AARCH64
else -> throw UnsupportedOperationException("Unsupported architecture: $osArch")
osName.contains("mac") || osName.contains("darwin") || osName.contains("os x") -> when {
osArch.contains("x86_64") || osArch.contains("amd64") || osArch.contains("x64") ->
Target.APPLE_X86_64
osArch.contains("aarch64") || osArch.contains("arm64") ->
Target.APPLE_AARCH64
else -> throw UnsupportedOperationException("Unsupported architecture on macOS: $osArch")
}

osName.contains("nix") || osName.contains("nux") || osName.contains("aix") -> when {
osArch.contains("x86_64") || osArch.contains("amd64") -> Target.LINUX_X86_64
osArch.contains("aarch64") -> Target.LINUX_AARCH64
else -> throw UnsupportedOperationException("Unsupported architecture: $osArch")
osArch.contains("x86_64") || osArch.contains("amd64") || osArch.contains("x64") ->
Target.LINUX_X86_64
osArch.contains("aarch64") || osArch.contains("arm64") ->
Target.LINUX_AARCH64
else -> throw UnsupportedOperationException("Unsupported architecture on Linux/Unix: $osArch")
}

else -> throw UnsupportedOperationException("Unsupported platform: $osName")
Expand Down