From e477f341cb6a6e50dd7d9942c0dc780a029587b0 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 12 Jan 2010 16:12:01 +0300 Subject: [PATCH] one more missing piece --- python/build/pycharm_build.gant | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant index 2fed6f9744e1..ed14683d3ad2 100644 --- a/python/build/pycharm_build.gant +++ b/python/build/pycharm_build.gant @@ -53,12 +53,13 @@ def includeFile(String filepath) { s } +def sandbox = "$home/out/pycharm"; +def sandbox_win = "$sandbox/win"; + setProperty("buildName", "PY-$buildNumber") target('default': "Build artifacts") { - def sandbox = "$home/out/pycharm"; - def modules = [ "python", "python-ide", "python-py", platformApiModules(), platformImplementationModules(), pluginFilter ].flatten() @@ -161,8 +162,8 @@ target('default': "Build artifacts") { } } - def installer = includeFile("nsis_installer.gant") - installer.nsis_installer(["$sandbox/layout"], + def installer = includeFile("$home/build/scripts/nsis_installer.gant") + installer.nsis_installer(["$sandbox/layout", $sandbox_win], "$home/python/build/strings.nsi", "$home/build/conf/nsis/paths.nsi", "PyCharmPY-") @@ -181,6 +182,7 @@ void wire_build_date(String buildName) { def buildExe() { if (!isMac()) { + ant.mkdir(dir: $sandbox_win) executeExternalAnt( "config.file": "$home/python/build/pycharm.exe4j", "output.file": "pycharm.exe", @@ -271,7 +273,7 @@ def executeExternalAnt(Map args, String file) { set(args, "build.number", buildName) set(args, "project.home", home) set(args, "artifacts.path", "$home/out/artifacts") - //set(args, "dist.win", paths.distWin) + set(args, "dist.win", $sandboxWin) //set(args, "dist.all", paths.distAll) //set(args, "dist.all.15", paths.distAll15)