From ef494a0d30d224a0883ae66e6803284fabd72c08 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Tue, 19 May 2015 11:24:40 +0300 Subject: [PATCH] fixed build issue when a build agent contains space in some configuration parameters. --- build/scripts/nsis_installer.gant | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/scripts/nsis_installer.gant b/build/scripts/nsis_installer.gant index 39795a6cf4b6..549e721d81c1 100644 --- a/build/scripts/nsis_installer.gant +++ b/build/scripts/nsis_installer.gant @@ -25,8 +25,8 @@ def nsis_installer(pathsToInclude, stringsFile, pathsFile, outNamePrefix, includ ant.mkdir(dir: "$box/jre") requireProperty("jdk_bundled_win", "1.7") def jdk_bundled_version = p("jdk_bundled_win") == "1.8" ? "${home}/build/jdk/jdk8_redist.zip" : "${home}/build/jdk/jdk_redist.zip" - getBundledJDK(new File("${home}/build/jdk/win"), "jdk"+ p("jdk_bundled_win"), "x32.zip", jdk_bundled_version) - ant.unzip(dest: "$box/jre", src: "${jdk_bundled_version}") + getBundledJDK(new File("${home}/build/jdk/win"), "jdk" + p("jdk_bundled_win"), "x32.zip", "jdk_win_redist") + ant.unzip(dest: "$box/jre", src: p("jdk_win_redist")) ant.copy(todir: "$box/bin") { fileset(dir: "$box/jre/jre/bin") { @@ -95,7 +95,7 @@ def nsis_installer(pathsToInclude, stringsFile, pathsFile, outNamePrefix, includ " /DIPR=\"${associateIpr}\"" + " /DOUT_FILE=\"${outFileName}\"" + " /DOUT_DIR=\"$paths.artifacts\"" + - " $box/nsiconf/idea.nsi") + " \"$box/nsiconf/idea.nsi\"") projectBuilder.stage("Signing binaries") executeExternalAnt(["dirName": "${paths.artifacts}", "fileName": "${outFileName}.exe"], "$home/build/signBuild.xml")