IDEA-CR-17833

build/conf/install_nsis3.sh

+#!/bin/sh
+# $1 - communityHome
+
+communityHome="$1"
+nsis="$communityHome/nsis"
+nsisVersion=3.01
+scons="$communityHome/scons"
+sconsVersion=2.5.0
+
+
+buildSCons() {
+  mkdir "$scons"
+  cd "$scons"
+  unzip -x "$communityHome/build/tools/scons-$sconsVersion.zip"
+  cd "$scons/scons-$sconsVersion"
+  python setup.py install --prefix="$scons/scons-$sconsVersion"
+}
+
+buildNSIS() {
+  mkdir "$nsis"
+  cd "$nsis"
+  unzip -x "$communityHome/build/tools/nsis-$nsisVersion.zip"
+  tar -xvf "$communityHome/build/tools/nsis-$nsisVersion-src.tar.bz2"
+  cd nsis-$nsisVersion
+  mkdir share
+  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
+}
+
+
+if [ ! -d "$scons" ]; then
+  buildSCons
+fi
+  
+if [ ! -d "$nsis" ]; then
+  buildNSIS
+fi
+

build/conf/nsis3.sh

-#!/bin/sh
-# $1 - communityHome
-
-nsis=$1/nsis
-if [ ! -d "$nsis" ]; then
-  mkdir "$nsis"
-  cd "$nsis"
-#  wget 'https://sourceforge.net/projects/nsis/files/NSIS%203/3.01/nsis-3.01-src.tar.bz2'
-#  wget 'https://sourceforge.net/projects/nsis/files/NSIS%203/3.01/nsis-3.01.zip'
-  unzip -x $1/build/tools/nsis-3.01.zip
-  tar -xvf $1/build/tools/nsis-3.01-src.tar.bz2
-  cd nsis-3.01
-  mkdir share
-  cd share
-  ln -s $nsis/nsis-3.01 nsis
-  cd $nsis/nsis-3.01-src
-scons SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all NSIS_CONFIG_CONST_DATA=no PREFIX=$nsis/nsis-3.01 install-compiler
-else
-  echo "$nsis is exist."
-fi
\ No newline at end of file

platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy

@@ -98,10 +98,10 @@ class WinExeInstallerBuilder {
                         " \"${box}/nsiconf/idea.nsi\"")
     }
     else if (SystemInfoRt.isLinux) {
-      ant.exec(command: "$communityHome/build/conf/nsis3.sh" +
-                        " ${buildContext.paths.communityHome}")
+      ant.exec(command: "\"$communityHome/build/conf/install_nsis3.sh\"" +
+                        " \"${buildContext.paths.communityHome}\"")
 
-      ant.exec(command: "${buildContext.paths.communityHome}/nsis/nsis-3.01/bin/makensis" +
+      ant.exec(command: "\"${buildContext.paths.communityHome}/nsis/nsis-3.01/bin/makensis\"" +
       " '-X!AddPluginDir \"${box}/NSIS/Plugins/x86-unicode\"'" +
       " '-X!AddIncludeDir \"${box}/NSIS/Include\"'" +
                  " -DNSIS_DIR=\"${box}/NSIS\"" +
@@ -171,4 +171,4 @@ class WinExeInstallerBuilder {
 !define PRODUCT_SETTINGS_DIR ".\${PRODUCT_PATHS_SELECTOR}"
 """
   }
-}
\ No newline at end of file
+}