From fdf82c0ab3ad8da46ee5b11469ba31b5d28e4bf7 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 12 Jan 2010 21:21:08 +0300
Subject: [PATCH] pycharm installer improvements

---
 python/build/pycharm_build.gant | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 7ec11833f087..b03c6c74c601 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -159,6 +159,8 @@ target('default': "Build artifacts") {
 
           "$sandbox/layout")
 
+  layoutWin(sandbox_win)
+
   buildExe()
   
   ant.echo(message: buildName, file: "$sandbox/layout/build.txt")
@@ -182,7 +184,7 @@ target('default': "Build artifacts") {
   installer.nsis_installer(["$sandbox/layout", sandbox_win],
                            "$home/python/build/strings.nsi",
                            "$home/python/build/paths.nsi",
-                           "pycharm")
+                           "pycharm", false)
 }
 
 String appInfoFile() {
@@ -254,6 +256,10 @@ def layoutFull(Map args, String target) {
       }
     }
 
+    dir("helpers") {
+      fileset(dir: "$home/python/helpers")
+    }
+
     def layouts = includeFile("$home/build/scripts/layouts.gant")
     layouts.layoutPlugins()
 
@@ -279,6 +285,19 @@ def layoutFull(Map args, String target) {
   }
 }
 
+def layoutWin(String target) {
+  layout(target) {
+    dir("bin") {
+      fileset(dir: "$home/bin") {
+        include(name: "libyjpagent.dll")
+      }
+      fileset(dir: "$home/python/build") {
+        include(name: "pycharm.bat")
+      }
+    }
+  }
+}
+
 def set(Map args, String key, Object value) {
   if (!args.containsKey(key)) {
     args[key] = value