From d0448ed0d0614ca24e4211da076acf17721423e1 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 21 Oct 2013 17:07:43 +0200
Subject: [PATCH] correctly handle internal structure of .tar.gz

---
 python/build/python_plugin_build.gant | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/python/build/python_plugin_build.gant b/python/build/python_plugin_build.gant
index 144745aa5836..6e6ca328e90d 100644
--- a/python/build/python_plugin_build.gant
+++ b/python/build/python_plugin_build.gant
@@ -8,13 +8,14 @@ includeTargets << new File("${projectHome}/build/scripts/utils.gant")
 setProperty("outDir", "${projectHome}/out/python")
 setProperty("ideaDir", "${outDir}/ideaCE")
 
-setProperty("ideaHome", "${ideaDir}/jdk16") //compiled idea
-
 setProperty("pluginHelp", "${outDir}/help")
 
 setProperty("buildNumber", requireProperty("build.number", snapshot))
 setProperty("ideaBuildNumber", requireProperty("idea.build.number"))
 
+setProperty("ideaHomePacked", "${ideaDir}/jdk16") //compiled idea
+setProperty("ideaHome", "${ideaDir}/jdk16/idea-IC-${ideaBuildNumber}") //compiled idea
+
 setProperty("pluginHome", "${projectHome}/python")
 setProperty("pluginRevision", "${buildNumber}")
 
@@ -69,9 +70,9 @@ target(name: "clean", description: "Cleanup output") {
 }
 
 target(name: "unzip") {
-  ant.mkdir(dir: "${ideaHome}")
+  ant.mkdir(dir: "${ideaHomePacked}")
   ant.gunzip(src: "${ideaDir}/ideaIC-${ideaBuildNumber}.tar.gz")
-  ant.untar(src: "${ideaDir}/ideaIC-${ideaBuildNumber}.tar", dest: "${ideaHome}")
+  ant.untar(src: "${ideaDir}/ideaIC-${ideaBuildNumber}.tar", dest: "${ideaHomePacked}")
 }
 
 target(name: "compile", description: "Compile module python") {