kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change arm64 to aarch64 (#274)

Browse Source
This commit is contained in:
Vechro
2022-10-20 20:11:49 +01:00
committed by GitHub
parent 0a24780d84
commit 0a0e102da9
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/kotlin/org/openrndr/extra/convention/FFmpegRule.kt
View File

@@ -12,9 +12,11 @@ import javax.inject.Inject
@CacheableRule @CacheableRule
abstract class FFmpegRule : ComponentMetadataRule { abstract class FFmpegRule : ComponentMetadataRule {
val jvmNativeVariants: List<JvmNativeVariant> = listOf( val jvmNativeVariants: List<JvmNativeVariant> = listOf(
JvmNativeVariant("linux-arm64", OperatingSystemFamily.LINUX, "arm64"), JvmNativeVariant("linux-arm64", OperatingSystemFamily.LINUX, "aarch64"),
JvmNativeVariant("linux-arm64", OperatingSystemFamily.LINUX, "arm64-v8"),
JvmNativeVariant("linux-x86_64", OperatingSystemFamily.LINUX, "x86-64"), JvmNativeVariant("linux-x86_64", OperatingSystemFamily.LINUX, "x86-64"),
JvmNativeVariant("macosx-arm64", OperatingSystemFamily.MACOS, "arm64"), JvmNativeVariant("macosx-arm64", OperatingSystemFamily.MACOS, "aarch64"),
JvmNativeVariant("macosx-arm64", OperatingSystemFamily.MACOS, "arm64-v8"),
JvmNativeVariant("macosx-x86_64", OperatingSystemFamily.MACOS, "x86-64"), JvmNativeVariant("macosx-x86_64", OperatingSystemFamily.MACOS, "x86-64"),
JvmNativeVariant("windows-x86_64", OperatingSystemFamily.WINDOWS, "x86-64") JvmNativeVariant("windows-x86_64", OperatingSystemFamily.WINDOWS, "x86-64")
) )
@@ -30,7 +32,7 @@ abstract class FFmpegRule : ComponentMetadataRule {
} }
} }
for ((targetName, os, arch) in jvmNativeVariants) { for ((targetName, os, arch) in jvmNativeVariants) {
addVariant("$targetName-runtime", "runtime") { addVariant("$targetName-$arch-runtime", "runtime") {
attributes { attributes {
attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(os)) attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(os))
attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(arch)) attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(arch))

8
buildSrc/src/main/kotlin/org/openrndr/extra/convention/LwjglRule.kt
View File

@@ -12,9 +12,11 @@ import javax.inject.Inject
@CacheableRule @CacheableRule
abstract class LwjglRule : ComponentMetadataRule { abstract class LwjglRule : ComponentMetadataRule {
val jvmNativeVariants: List<JvmNativeVariant> = listOf( val jvmNativeVariants: List<JvmNativeVariant> = listOf(
JvmNativeVariant("natives-linux-arm64", OperatingSystemFamily.LINUX, "arm64"), JvmNativeVariant("natives-linux-arm64", OperatingSystemFamily.LINUX, "aarch64"),
JvmNativeVariant("natives-linux-arm64", OperatingSystemFamily.LINUX, "arm64-v8"),
JvmNativeVariant("natives-linux", OperatingSystemFamily.LINUX, "x86-64"), JvmNativeVariant("natives-linux", OperatingSystemFamily.LINUX, "x86-64"),
JvmNativeVariant("natives-macos-arm64", OperatingSystemFamily.MACOS, "arm64"), JvmNativeVariant("natives-macos-arm64", OperatingSystemFamily.MACOS, "aarch64"),
JvmNativeVariant("natives-macos-arm64", OperatingSystemFamily.MACOS, "arm64-v8"),
JvmNativeVariant("natives-macos", OperatingSystemFamily.MACOS, "x86-64"), JvmNativeVariant("natives-macos", OperatingSystemFamily.MACOS, "x86-64"),
JvmNativeVariant("natives-windows", OperatingSystemFamily.WINDOWS, "x86-64") JvmNativeVariant("natives-windows", OperatingSystemFamily.WINDOWS, "x86-64")
) )
@@ -32,7 +34,7 @@ abstract class LwjglRule : ComponentMetadataRule {
} }
} }
for ((targetName, os, arch) in jvmNativeVariants) { for ((targetName, os, arch) in jvmNativeVariants) {
addVariant("$targetName-runtime", "runtime") { addVariant("$targetName-$arch-runtime", "runtime") {
attributes { attributes {
attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(os)) attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(os))
attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(arch)) attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(arch))

2
buildSrc/src/main/kotlin/org/openrndr/extra/convention/Utils.kt
View File

@@ -1,12 +1,10 @@
package org.openrndr.extra.convention package org.openrndr.extra.convention
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.named import org.gradle.kotlin.dsl.named
import org.gradle.nativeplatform.MachineArchitecture import org.gradle.nativeplatform.MachineArchitecture
import org.gradle.nativeplatform.OperatingSystemFamily import org.gradle.nativeplatform.OperatingSystemFamily
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
data class JvmNativeVariant(val targetName: String, val os: String, val arch: String) data class JvmNativeVariant(val targetName: String, val os: String, val arch: String)

5
buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts
View File

@@ -42,10 +42,7 @@ dependencies {
} }
kotlin { kotlin {
jvmToolchain { jvmToolchain(libs.versions.jvmTarget.get().toInt())
this as JavaToolchainSpec
languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get()))
}
} }
tasks { tasks {

5
buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts
View File

@@ -32,10 +32,7 @@ tasks.withType<KotlinCompile>() {
kotlin { kotlin {
jvm { jvm {
jvmToolchain { jvmToolchain(libs.versions.jvmTarget.get().toInt())
this as JavaToolchainSpec
languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get()))
}
compilations { compilations {
val main by getting val main by getting
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")