build scripts: allow to use product version in artifact names, corrected

This commit is contained in:
nik
2016-07-13 11:51:12 +03:00
parent b996907a94
commit 2e7c62826d
5 changed files with 5 additions and 5 deletions
@@ -124,7 +124,7 @@ class LinuxDistributionBuilder {
private void buildTarGz(String jreDirectoryPath) {
def tarRoot = customizer.rootDirectoryName(buildContext.buildNumber)
def suffix = jreDirectoryPath != null ? "" : "-no-jdk"
def tarPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)}${suffix}.tar"
def tarPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${suffix}.tar"
def extraBins = customizer.extraExecutables
def paths = [buildContext.paths.distAll, unixDistPath]
if (jreDirectoryPath != null) {
@@ -208,7 +208,7 @@ class MacDistributionBuilder {
def extraBins = customizer.extraExecutables
def allPaths = [buildContext.paths.distAll, macDistPath]
def zipRoot = customizer.rootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)
def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)}.mac.zip"
def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}.mac.zip"
buildContext.ant.zip(zipfile: targetPath) {
allPaths.each {
zipfileset(dir: it, prefix: zipRoot) {
@@ -65,7 +65,7 @@ class MacDmgBuilder {
private void doSignAndBuildDmg(String macZipPath, String jreArchivePath) {
def suffix = jreArchivePath != null ? "" : "-no-jdk"
String targetFileName = buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber) + suffix
String targetFileName = buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber) + suffix
def sitFilePath = "$artifactsPath/${targetFileName}.sit"
ant.copy(file: macZipPath, tofile: sitFilePath)
ftpAction("mkdir") {}
@@ -44,7 +44,7 @@ class WinExeInstallerBuilder {
}
String communityHome = buildContext.paths.communityHome
String outFileName = buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)
String outFileName = buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)
buildContext.messages.progress("Building Windows installer $outFileName")
def box = "$buildContext.paths.temp/winInstaller"
@@ -197,7 +197,7 @@ IDS_VM_OPTIONS=$vmOptions
private void buildWinZip(String jreDirectoryPath, String zipNameSuffix) {
buildContext.messages.block("Build Windows ${zipNameSuffix}.zip distribution") {
def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(applicationInfo, buildContext.buildNumber)}${zipNameSuffix}.zip"
def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${zipNameSuffix}.zip"
def zipPrefix = customizer.rootDirectoryName(buildContext.buildNumber)
def dirs = [buildContext.paths.distAll, winDistPath]
if (jreDirectoryPath != null) {