specify arch in release tarball name

This commit is contained in:
Craig Raw 2022-10-25 12:02:00 +02:00
parent f501f08e17
commit 3bfa5d3dc4

View file

@ -15,8 +15,10 @@ if(os.macOsX) {
} }
def targetName = "" def targetName = ""
def osArch = "x64" def osArch = "x64"
def releaseArch = "x86_64"
if(System.getProperty("os.arch") == "aarch64") { if(System.getProperty("os.arch") == "aarch64") {
osArch = "aarch64" osArch = "aarch64"
releaseArch = "aarch64"
targetName = "-" + osArch targetName = "-" + osArch
} }
def headless = "true".equals(System.getProperty("java.awt.headless")) def headless = "true".equals(System.getProperty("java.awt.headless"))
@ -261,7 +263,7 @@ task packageZipDistribution(type: Zip) {
task packageTarDistribution(type: Tar) { task packageTarDistribution(type: Tar) {
dependsOn removeGroupWritePermission dependsOn removeGroupWritePermission
archiveFileName = "sparrow-${sparrowVersion}.tar.gz" archiveFileName = "sparrow-${sparrowVersion}-${releaseArch}.tar.gz"
destinationDirectory = file("$buildDir/jpackage") destinationDirectory = file("$buildDir/jpackage")
compression = Compression.GZIP compression = Compression.GZIP
from("$buildDir/jpackage/") { from("$buildDir/jpackage/") {