From 747a546950d3d75bc7855e2469f4d30e8a8e1d5f Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 14 Oct 2010 16:26:05 +0400
Subject: [PATCH] enable YourKit only in EAP builds

Conflicts:

	python/build/pycharm.sh
	python/build/pycharm_build.gant
---
 python/build/pycharm_build.gant | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 8e6724dd241e..1e167a5858a3 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -139,7 +139,7 @@ target('default': "Build artifacts") {
   ant.xmlproperty(file: "$home/python/resources/idea/PythonApplicationInfo.xml", collapseAttributes: "true")
   setProperty("isEap", isEap())
 
-  if (isEap) {
+  if (isEap()) {
     setProperty("vmoptions", vmoptions + " -agentlib:yjpagent=disablej2ee,disablecounts,disablealloc,sessionname=PyCharm")
   }
 
@@ -350,7 +350,7 @@ def buildTarGz() {
     tarfileset(dir: "$home/community/bin/nix", filemode: "755", prefix: "$tarRoot/bin") {
       include(name: "inspect*.sh")
     }
-    tarfileset(dir: "$paths.distUnix/bin", filemode: "755", prefix: "$tarRoot/bin") {
+    tarfileset(dir: "$home/python/build", filemode: "755", prefix: "$paths.distUnix/bin") {
       include(name: "pycharm.sh")
     }
     tarfileset(dir: "$home/python/build", fullpath: "$tarRoot/bin/pycharm.vmoptions") {
@@ -557,11 +557,11 @@ def layoutWin(String target) {
     }
   }
   ant.copy(file: "$home/python/help/pycharmhelp.jar", todir: "$target/help")
-  ant.echo(file: "$target/bin/pycharm.exe.vmoptions", message: vmoptions.replace(' ', '\n') )
+  ant.echo(file: "$target/bin/idea.exe.vmoptions", message: vmoptions.replace(' ', '\n') )
 }
 
 def layoutUnix(String target) {
-  ant.copy(file: "$home/python/build/pycharm.sh", todir: "$target/bin")
+  ant.copy(file: "$home/pycharm/build/pycharm.sh", todir: "$target/bin")
   ant.replace(file: "$target/bin/pycharm.sh") {
     replacefilter(token: "@@isEap@@", value: isEap())
   }