Merge pull request #5516 from cd2357/fix-raspi-build

Fix raspi build
This commit is contained in:
Christoph Atteneder 2021-05-21 15:40:31 +02:00 committed by GitHub
commit c6d6bbefa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -162,9 +162,8 @@ task retrieveAndExtractJavaBinaries {
task packageInstallers {
description 'Call jpackage to prepare platform-specific binaries for this platform'
dependsOn 'retrieveAndExtractJavaBinaries'
// Clean all previous artefacts and create a fresh shadowJar for the installers
dependsOn rootProject.clean
dependsOn ':desktop:shadowJar'
dependsOn ':desktop:build' // Full build needed for "desktop/build/app/lib", used for raspi package
doLast {
String jPackageFilePath = retrieveAndExtractJavaBinaries.property('jpackageFilePath')
@ -204,8 +203,7 @@ task packageInstallers {
String appVersion = version.replaceAll("-SNAPSHOT", "")
println "Packaging Bisq version ${appVersion}"
// zip jar lib for Raspberry Pi only on macOS as there are path issues on Windows and it is only needed once
// for the release
// zip jar lib for Raspberry Pi only on macOS as it is only needed once for the release
if (Os.isFamily(Os.FAMILY_MAC)) {
println "Zipping jar lib for raspberry pi"
ant.zip(basedir: "${project(':desktop').buildDir}/app/lib",