diff --git a/build/conf/install_nsis3.sh b/build/conf/install_nsis3.sh index 5509e2e8aa42..9f36e7a798b9 100644 --- a/build/conf/install_nsis3.sh +++ b/build/conf/install_nsis3.sh @@ -3,7 +3,7 @@ communityHome="$1" nsis="$communityHome/build/tools/nsis" -nsisVersion=3.01 +nsisVersion=3.02.1 scons="$communityHome/build/tools/scons" sconsVersion=2.5.0 @@ -26,7 +26,7 @@ buildNSIS() { cd share ln -s "$nsis/nsis-$nsisVersion" nsis cd "$nsis/nsis-$nsisVersion-src" - "$scons/scons-$sconsVersion/bin/scons" SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all NSIS_CONFIG_CONST_DATA=no PREFIX="$nsis/nsis-$nsisVersion" install-compiler + "$scons/scons-$sconsVersion/bin/scons" SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all NSIS_CONFIG_CONST_DATA=no NSIS_CONFIG_LOG=yes PREFIX="$nsis/nsis-$nsisVersion" install-compiler } diff --git a/build/tools/nsis-3.02.1-src.tar.bz2 b/build/tools/nsis-3.02.1-src.tar.bz2 new file mode 100644 index 000000000000..3ed31c183398 Binary files /dev/null and b/build/tools/nsis-3.02.1-src.tar.bz2 differ diff --git a/build/tools/nsis-3.02.1.zip b/build/tools/nsis-3.02.1.zip new file mode 100644 index 000000000000..21fd278d9997 Binary files /dev/null and b/build/tools/nsis-3.02.1.zip differ diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy index eb0c07df4aea..b0abeb71d585 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy @@ -144,7 +144,7 @@ class WinExeInstallerBuilder { ant.exec(command: "\"$installScriptPath\"" + " \"${buildContext.paths.communityHome}\"") - ant.exec(command: "\"${buildContext.paths.communityHome}/build/tools/nsis/nsis-3.01/bin/makensis\"" + + ant.exec(command: "\"${buildContext.paths.communityHome}/build/tools/nsis/nsis-3.02.1/bin/makensis\"" + " '-X!AddPluginDir \"${box}/NSIS/Plugins/x86-unicode\"'" + " '-X!AddIncludeDir \"${box}/NSIS/Include\"'" + " -DNSIS_DIR=\"${box}/NSIS\"" +