luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the aarch64 binaries for macOS to the sbtn mappings

This commit is contained in:
Julien Richard-Foy 2023-07-10 16:18:12 +02:00
parent 5f6eb1b2ec
commit 4111a8fd2a
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
launcher-package/build.sbt
View File

@ -71,10 +71,12 @@ val exportRepoUsingCoursier = taskKey[File]("export Maven style repository")
val exportRepoCsrDirectory = settingKey[File]("") val exportRepoCsrDirectory = settingKey[File]("")
val x86MacPlatform = "x86_64-apple-darwin" val x86MacPlatform = "x86_64-apple-darwin"
val aarch64MacPlatform = "aarch64-apple-darwin"
val x86LinuxPlatform = "x86_64-pc-linux" val x86LinuxPlatform = "x86_64-pc-linux"
val aarch64LinuxPlatform = "aarch64-pc-linux" val aarch64LinuxPlatform = "aarch64-pc-linux"
val x86WindowsPlatform = "x86_64-pc-win32" val x86WindowsPlatform = "x86_64-pc-win32"
val x86MacImageName = s"sbtn-$x86MacPlatform" val x86MacImageName = s"sbtn-$x86MacPlatform"
val aarch64MacImageName = s"sbtn-$aarch64MacPlatform"
val x86LinuxImageName = s"sbtn-$x86LinuxPlatform" val x86LinuxImageName = s"sbtn-$x86LinuxPlatform"
val aarch64LinuxImageName = s"sbtn-$aarch64LinuxPlatform" val aarch64LinuxImageName = s"sbtn-$aarch64LinuxPlatform"
val x86WindowsImageName = s"sbtn-$x86WindowsPlatform.exe" val x86WindowsImageName = s"sbtn-$x86WindowsPlatform.exe"
@ -126,26 +128,38 @@ val root = (project in file(".")).
sbtnJarsMappings := { sbtnJarsMappings := {
val baseUrl = sbtnJarsBaseUrl.value val baseUrl = sbtnJarsBaseUrl.value
val v = sbtnVersion.value val v = sbtnVersion.value
val macosImageTar = s"sbtn-$x86MacPlatform-$v.tar.gz" val macosX86ImageTar = s"sbtn-$x86MacPlatform-$v.tar.gz"
val macosAarch64ImageTar = s"sbtn-$aarch64MacPlatform-$v.tar.gz"
val linuxX86ImageTar = s"sbtn-$x86LinuxPlatform-$v.tar.gz" val linuxX86ImageTar = s"sbtn-$x86LinuxPlatform-$v.tar.gz"
val linuxAarch64ImageTar = s"sbtn-$aarch64LinuxPlatform-$v.tar.gz" val linuxAarch64ImageTar = s"sbtn-$aarch64LinuxPlatform-$v.tar.gz"
val windowsImageZip = s"sbtn-$x86WindowsPlatform-$v.zip" val windowsImageZip = s"sbtn-$x86WindowsPlatform-$v.zip"
val t = target.value val t = target.value
val macosTar = t / macosImageTar val macosX86Tar = t / macosX86ImageTar
val macosAarch64Tar = t / macosAarch64ImageTar
val linuxX86Tar = t / linuxX86ImageTar val linuxX86Tar = t / linuxX86ImageTar
val linuxAarch64Tar = t / linuxAarch64ImageTar val linuxAarch64Tar = t / linuxAarch64ImageTar
val windowsZip = t / windowsImageZip val windowsZip = t / windowsImageZip
import dispatch.classic._ import dispatch.classic._
if(!macosTar.exists && !isWindows && sbtIncludeSbtn) { if(!macosX86Tar.exists && !isWindows && sbtIncludeSbtn) {
IO.touch(macosTar) IO.touch(macosX86Tar)
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(macosTar)) val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(macosX86Tar))
try Http(url(s"$baseUrl/v$v/$macosImageTar") >>> writer) try Http(url(s"$baseUrl/v$v/$macosX86ImageTar") >>> writer)
finally writer.close() finally writer.close()
val platformDir = t / x86MacPlatform val platformDir = t / x86MacPlatform
IO.createDirectory(platformDir) IO.createDirectory(platformDir)
s"tar zxvf $macosTar --directory $platformDir".! s"tar zxvf $macosX86Tar --directory $platformDir".!
IO.move(platformDir / "sbtn", t / x86MacImageName) IO.move(platformDir / "sbtn", t / x86MacImageName)
} }
if(!macosAarch64Tar.exists && !isWindows && sbtIncludeSbtn) {
IO.touch(macosAarch64Tar)
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(macosAarch64Tar))
try Http(url(s"$baseUrl/v$v/$macosAarch64ImageTar") >>> writer)
finally writer.close()
val platformDir = t / aarch64MacPlatform
IO.createDirectory(platformDir)
s"tar zxvf $macosAarch64Tar --directory $platformDir".!
IO.move(platformDir / "sbtn", t / aarch64MacImageName)
}
if(!linuxX86Tar.exists && !isWindows && sbtIncludeSbtn) { if(!linuxX86Tar.exists && !isWindows && sbtIncludeSbtn) {
IO.touch(linuxX86Tar) IO.touch(linuxX86Tar)
val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(linuxX86Tar)) val writer = new java.io.BufferedOutputStream(new java.io.FileOutputStream(linuxX86Tar))
@ -179,6 +193,7 @@ val root = (project in file(".")).
else if (isWindows) Seq(t / x86WindowsImageName -> s"bin/$x86WindowsImageName") else if (isWindows) Seq(t / x86WindowsImageName -> s"bin/$x86WindowsImageName")
else else
Seq(t / x86MacImageName -> s"bin/$x86MacImageName", Seq(t / x86MacImageName -> s"bin/$x86MacImageName",
t / aarch64MacImageName -> s"bin/$aarch64MacImageName",
t / x86LinuxImageName -> s"bin/$x86LinuxImageName", t / x86LinuxImageName -> s"bin/$x86LinuxImageName",
t / aarch64LinuxImageName -> s"bin/$aarch64LinuxImageName", t / aarch64LinuxImageName -> s"bin/$aarch64LinuxImageName",
t / x86WindowsImageName -> s"bin/$x86WindowsImageName") t / x86WindowsImageName -> s"bin/$x86WindowsImageName")