From a4e56c2ee127a35685ab4d9656925b48b9c6d32f Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 3 Sep 2010 12:56:44 +0400
Subject: [PATCH] moved common JVM arguments for all builds to utils.gant
 changed debug port to 5555 to avoid conflicts

---
 build/scripts/common_tests.gant | 10 ++--------
 build/scripts/utils.gant        | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index 21790b69f1c9..50673248bdf5 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -23,21 +23,15 @@ target('default': 'The default target') {
   depends(compile)
 
   ant.junit(fork: "yes", showoutput: "true") {
-    jvmarg (value: "-ea")
     pass("idea.test.group")
     pass("idea.test.patterns")
     pass("idea.fast.only")
     pass("teamcity.build.tempDir")
     pass("teamcity.tests.recentlyFailedTests.file")
     jvmarg (value: "-Didea.platform.prefix=Idea")
-    jvmarg (value: "-Didea.home.path=$home")
-    jvmarg (value: "-Xbootclasspath/p:${boot.output}")
     jvmarg (value: "-Djava.system.class.loader=com.intellij.util.lang.UrlClassLoader")
-    jvmarg (value: "-XX:+HeapDumpOnOutOfMemoryError")
-    jvmarg (value: "-Didea.system.path=${p("teamcity.build.tempDir")}/system")
-    jvmarg (value: "-Didea.config.path=${p("teamcity.build.tempDir")}/config")
-    jvmarg (value: "-Xdebug")
-    jvmarg (value: "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005")
+
+    commonJvmArgs().each { jvmarg(value: it) }
 
     if (isDefined("jvm_args")) {
       jvm_args.each { jvmarg(value: it) }
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 5f46552722dc..8974a752cbf2 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -95,4 +95,16 @@ binding.setVariable("notifyArtifactBuilt", { String artifactPath ->
   }
   def relativePath = artifactPath.substring(home.length())
   project.info("##teamcity[publishArtifacts '$relativePath']")
-})
\ No newline at end of file
+})
+
+binding.setVariable("commonJvmArgs", {
+  return [
+   "-ea",
+   "-Didea.home.path=$home",
+   "-Xbootclasspath/p:${boot.output}",
+   "-XX:+HeapDumpOnOutOfMemoryError",
+   "-Didea.system.path=${p("teamcity.build.tempDir")}/system",
+   "-Didea.config.path=${p("teamcity.build.tempDir")}/config",
+   "-Xdebug",
+   "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5555"]
+})