beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 09:00:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes

Browse source
This commit is contained in:
crschnick 2023-02-02 13:58:50 +00:00
parent 12bb4f744d
commit bf176393ad
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -27,4 +27,5 @@ project.ext {
privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : [] privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : []
isFullRelease = System.getenv('RELEASE') != null && Boolean.parseBoolean(System.getenv('RELEASE')) isFullRelease = System.getenv('RELEASE') != null && Boolean.parseBoolean(System.getenv('RELEASE'))
versionString = file('version').text + (isFullRelease ? '' : '-SNAPSHOT') versionString = file('version').text + (isFullRelease ? '' : '-SNAPSHOT')
canonicalVersionString = file('version').text
} }

6
dist/jpackage.gradle vendored
View file

@ -55,10 +55,10 @@ jlink {
imageName = 'xpiped' imageName = 'xpiped'
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
icon = "logo/logo.ico" icon = "logo/logo.ico"
appVersion = version appVersion = rootProject.canonicalVersionString
} else if (org.gradle.internal.os.OperatingSystem.current().isLinux()) { } else if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
icon = "logo/logo.png" icon = "logo/logo.png"
appVersion = version appVersion = rootProject.canonicalVersionString
} else { } else {
icon = "logo/logo.icns" icon = "logo/logo.icns"
@ -80,7 +80,7 @@ jlink {
resourceDir = file("$projectDir/misc/mac") resourceDir = file("$projectDir/misc/mac")
// Mac does not like a zero major version // Mac does not like a zero major version
def modifiedVersion = version.toString() def modifiedVersion = rootProject.canonicalVersionString
if (Integer.parseInt(modifiedVersion.substring(0, 1)) == 0) { if (Integer.parseInt(modifiedVersion.substring(0, 1)) == 0) {
modifiedVersion = "1" + modifiedVersion.substring(1) modifiedVersion = "1" + modifiedVersion.substring(1)
} }

2
private_extensions.txt
View file

@ -1,2 +0,0 @@
jdbcx
office