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

[JS] Support downloading v8 for mac-arm64

Browse Source
This commit is contained in:
Zalim Bashorov
2022-04-21 19:22:03 +02:00
parent af21b67eb5
commit 2ed3349f7b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+8 -3
View File
@@ -97,7 +97,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
} }
enum class OsName { WINDOWS, MAC, LINUX, UNKNOWN } enum class OsName { WINDOWS, MAC, LINUX, UNKNOWN }
enum class OsArch { X86_32, X86_64, UNKNOWN } enum class OsArch { X86_32, X86_64, ARM64, UNKNOWN }
data class OsType(val name: OsName, val arch: OsArch) data class OsType(val name: OsName, val arch: OsArch)
val currentOsType = run { val currentOsType = run {
val gradleOs = OperatingSystem.current() val gradleOs = OperatingSystem.current()
@@ -110,7 +110,10 @@ val currentOsType = run {
val osArch = when (providers.systemProperty("sun.arch.data.model").forUseAtConfigurationTime().get()) { val osArch = when (providers.systemProperty("sun.arch.data.model").forUseAtConfigurationTime().get()) {
"32" -> OsArch.X86_32 "32" -> OsArch.X86_32
"64" -> OsArch.X86_64 "64" -> when (providers.systemProperty("os.arch").forUseAtConfigurationTime().get().toLowerCase()) {
"aarch64" -> OsArch.ARM64
else -> OsArch.X86_64
}
else -> OsArch.UNKNOWN else -> OsArch.UNKNOWN
} }
@@ -121,7 +124,8 @@ val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2020/06/
val jsShellSuffix = when (currentOsType) { val jsShellSuffix = when (currentOsType) {
OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686" OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686"
OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64" OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64"
OsType(OsName.MAC, OsArch.X86_64) -> "mac" OsType(OsName.MAC, OsArch.X86_64),
OsType(OsName.MAC, OsArch.ARM64) -> "mac"
OsType(OsName.WINDOWS, OsArch.X86_32) -> "win32" OsType(OsName.WINDOWS, OsArch.X86_32) -> "win32"
OsType(OsName.WINDOWS, OsArch.X86_64) -> "win64" OsType(OsName.WINDOWS, OsArch.X86_64) -> "win64"
else -> error("unsupported os type $currentOsType") else -> error("unsupported os type $currentOsType")
@@ -147,6 +151,7 @@ val v8osString = when (currentOsType) {
OsType(OsName.LINUX, OsArch.X86_32) -> "linux32" OsType(OsName.LINUX, OsArch.X86_32) -> "linux32"
OsType(OsName.LINUX, OsArch.X86_64) -> "linux64" OsType(OsName.LINUX, OsArch.X86_64) -> "linux64"
OsType(OsName.MAC, OsArch.X86_64) -> "mac64" OsType(OsName.MAC, OsArch.X86_64) -> "mac64"
OsType(OsName.MAC, OsArch.ARM64) -> "mac-arm64"
OsType(OsName.WINDOWS, OsArch.X86_32) -> "win32" OsType(OsName.WINDOWS, OsArch.X86_32) -> "win32"
OsType(OsName.WINDOWS, OsArch.X86_64) -> "win64" OsType(OsName.WINDOWS, OsArch.X86_64) -> "win64"
else -> error("unsupported os type $currentOsType") else -> error("unsupported os type $currentOsType")