From cdb15acc4df5ec338ec914662d73c8d4b4b95976 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 12 Nov 2012 14:17:31 +0400
Subject: [PATCH] jps distribution added to community build configuration

---
 build/scripts/dist.gant    |  7 ++++++-
 build/scripts/layouts.gant | 30 ++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index 0a321dc513b3..0cd9bdcfc85d 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -29,6 +29,7 @@ class Paths {
   final artifacts
   final artifacts_core
   final artifacts_core_upsource
+  final artifacts_jps
 
   def Paths(String out) {
     sandbox = out
@@ -39,6 +40,7 @@ class Paths {
     artifacts = "$sandbox/artifacts"
     artifacts_core = "$artifacts/core"
     artifacts_core_upsource = "$artifacts/core-upsource"
+    artifacts_jps = "$artifacts/jps"
   }
 }
 
@@ -52,13 +54,14 @@ target(compile: "Compile project") {
   projectBuilder.stage("Cleaning up sandbox folder")
   forceDelete(paths.sandbox)
 
-  [paths.sandbox, paths.distWin, paths.distAll, paths.distUnix, paths.distMac, paths.artifacts, paths.artifacts_core].each {
+  [paths.sandbox, paths.distWin, paths.distAll, paths.distUnix, paths.distMac, paths.artifacts, paths.artifacts_core, paths.artifacts_jps].each {
     ant.mkdir(dir: it)
   }
 
   projectBuilder.targetFolder = "$out/classes"
   projectBuilder.cleanOutput()
   projectBuilder.buildProduction()
+  projectBuilder.makeModuleTests(findModule("jps-builders"))
 }
 
 private String appInfoFile() {
@@ -102,6 +105,8 @@ def layoutAll(Map args, String home, String out, Paths _paths = null) {
   notifyArtifactBuilt(paths.artifacts_core)
   layouts.layout_core_upsource(home, paths.artifacts_core_upsource)
   notifyArtifactBuilt(paths.artifacts_core_upsource)
+  layouts.layout_jps(home, paths.artifacts_jps)
+  notifyArtifactBuilt(paths.artifacts_jps)
 
   layout(paths.distAll) {
     dir("bin") {
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index b4ea255f8c12..6256972f52d5 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -537,7 +537,7 @@ def reorder(String home, String targetDirectory) {
   }
 }
 
-def layout_jps(String target) {
+def layout_jps(String home, String target) {
   layout(target) {
     jar("util.jar") {
       module("annotations")
@@ -555,10 +555,36 @@ def layout_jps(String target) {
       module("instrumentation-util")
       module("jps-builders")
       module("jps-standalone-builder")
+      module("java-runtime")
     }
-    jar("jps-groovy-plugin.jar") {
+    jar("groovy-jps-plugin.jar") {
+      module("groovy-jps-plugin")
+      module("groovy-rt-constants")
+    }
+    jar("groovy_rt.jar") {
       module("groovy_rt")
     }
+    jar("ui-designer-jps-plugin.jar") {
+      module("ui-designer-jps-plugin")
+    }
+    fileset(dir: "$home/lib") {
+      include(name: "jdom.jar")
+      include(name: "jna.jar")
+      include(name: "trove4j.jar")
+      include(name: "asm4-all.jar")
+      include(name: "nanoxml-*.jar")
+      include(name: "protobuf-*.jar")
+      include(name: "optimizedFileManager.jar")
+      include(name: "log4j.jar")
+      include(name: "jgoodies-forms.jar")
+    }
+    dir("test") {
+      jar("jps-build-test.jar") {
+        moduleTests("jps-builders")
+        moduleTests("jps-model-impl")
+        moduleTests("jps-model-serialization")
+      }
+    }
   }
 }