mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-02 10:41:40 +12:00
Small fixes
This commit is contained in:
parent
a4ffceeac6
commit
96d78b09fa
3 changed files with 4 additions and 5 deletions
|
@ -27,4 +27,5 @@ project.ext {
|
|||
privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : []
|
||||
isFullRelease = System.getenv('RELEASE') != null && Boolean.parseBoolean(System.getenv('RELEASE'))
|
||||
versionString = file('version').text + (isFullRelease ? '' : '-SNAPSHOT')
|
||||
canonicalVersionString = file('version').text
|
||||
}
|
||||
|
|
6
dist/jpackage.gradle
vendored
6
dist/jpackage.gradle
vendored
|
@ -55,10 +55,10 @@ jlink {
|
|||
imageName = 'xpiped'
|
||||
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
|
||||
icon = "logo/logo.ico"
|
||||
appVersion = version
|
||||
appVersion = rootProject.canonicalVersionString
|
||||
} else if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
|
||||
icon = "logo/logo.png"
|
||||
appVersion = version
|
||||
appVersion = rootProject.canonicalVersionString
|
||||
} else {
|
||||
icon = "logo/logo.icns"
|
||||
|
||||
|
@ -80,7 +80,7 @@ jlink {
|
|||
resourceDir = file("$projectDir/misc/mac")
|
||||
|
||||
// Mac does not like a zero major version
|
||||
def modifiedVersion = version.toString()
|
||||
def modifiedVersion = rootProject.canonicalVersionString
|
||||
if (Integer.parseInt(modifiedVersion.substring(0, 1)) == 0) {
|
||||
modifiedVersion = "1" + modifiedVersion.substring(1)
|
||||
}
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
jdbcx
|
||||
office
|
Loading…
Reference in a new issue