honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up rpm artifact naming (#590) 

Signed-off-by: Tom spot Callaway <spotaws@amazon.com>
This commit is contained in:
Tom "spot" Callaway 2021-04-21 14:45:53 -04:00 committed by GitHub
parent 97698e082c
commit b8f9469cc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
distribution/packages/build.gradle
View File

@ -129,12 +129,17 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
}
}
// Follow opensearch's file naming convention
String jdkString = jdk ? "" : "no-jdk-"
String jdkString = jdk ? "" : "-no-jdk"
String prefix = "${architecture == 'aarch64' ? 'aarch64-' : ''}${jdk ? '' : 'no-jdk-'}${type}"
destinationDirectory = file("${prefix}/build/distributions")
// SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself
conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}-${jdkString}${archString}.${type}")) }
// Deb convention uses a '-' for final separator before architecture, rpm uses a '.'
if (type == 'deb') {
conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}${jdkString}-${archString}.${type}")) }
} else {
conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}${jdkString}.${archString}.${type}")) }
}
String packagingFiles = "build/packaging/${jdk ? '' : 'no-jdk-'}${type}"