mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix jpackage option concatenation

Browse Source 
Fixed typo affecting jpackage option concatenation, where a missing "+" caused subsequent options to not be considered. Surround concatenated options with parentheses, to ensure such a typo in the future is marked as a syntax error, and therefore avoided.
This commit is contained in:
cd2357 2020-10-04 12:16:29 +02:00
parent 91190ee101
commit ebadce5cee
No known key found for this signature in database
GPG Key ID: F26C56748514D0D3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desktop/package/package.gradle
View File

@ -207,7 +207,7 @@ task packageInstallers {
String appVersion = '1.1.1'
println "Packaging Bisq version ${appVersion}"
String commonOpts =
String commonOpts = (
// Generic options
" --dest \"${binariesFolderPath}\"" +
" --name bisq-pr4242-test" +
@ -225,14 +225,16 @@ task packageInstallers {
" --java-options -Djava.net.preferIPv4Stack=true" +
// Options for creating the application package
" --license-file \"${licenseFilePath}\"" +
" --runtime-image \"${jdkForAppRuntimePath}\"";
" --runtime-image \"${jdkForAppRuntimePath}\""
)
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
String windowsOpts =
" --icon ${project(':desktop').projectDir}/package/windows/Bisq.ico"
String windowsOpts = (
" --icon ${project(':desktop').projectDir}/package/windows/Bisq.ico" +
" --win-per-user-install" +
" --win-menu" +
" --win-shortcut" // TODO Seems to not work, no shortcuts created
)
// TODO How does the current package/windows/Bisq.iss play into this?
@ -241,19 +243,21 @@ task packageInstallers {
executeCmd(jPackageFilePath + commonOpts + windowsOpts + " --type msi")
} else if (Os.isFamily(Os.FAMILY_MAC)) {
// TODO Include signing args, like --mac-sign / -mac-signing-keychain / --mac-signing-key-user-name
String macOpts =
" --icon ${project(':desktop').projectDir}/package/macosx/Bisq.icns"
String macOpts = (
" --icon ${project(':desktop').projectDir}/package/macosx/Bisq.icns" +
" --mac-package-name Bisq-PR-4242" +
" --mac-package-identifier Bisq-PR-4242-ID"
)
executeCmd(jPackageFilePath + commonOpts + macOpts + " --type dmg")
} else {
String linuxOpts =
" --icon ${project(':desktop').projectDir}/package/linux/icon.png"
String linuxOpts = (
" --icon ${project(':desktop').projectDir}/package/linux/icon.png" +
" --linux-package-name bisq-build-test" +
" --linux-app-release ${appVersion}" +
" --linux-menu-group Network" +
" --linux-shortcut"
)
executeCmd(jPackageFilePath + commonOpts + linuxOpts +
" --linux-deb-maintainer contact@bisq.network" +