From 027bd641ba66fe1a93be92f739e876c0d1517c34 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 1 Apr 2015 15:06:55 +0300
Subject: [PATCH] IDEA-138199: Build sources artifact with IDEA Community
 sources and flat structure (without modules)

---
 build/scripts/dist.gant    | 6 +++++-
 build/scripts/layouts.gant | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index d61a0b8d2899..efc8f4fd3b65 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+
+import org.jetbrains.jps.gant.LayoutInfo
+
 import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
 
 includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant")
@@ -122,7 +125,7 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps =
   ant.echo(message: args.buildNumber, file: "$paths.distAll/build.txt")
 
   def layouts = includeFile("$home/build/scripts/layouts.gant")
-  layouts.layoutFull(home, paths.distAll, null)
+  LayoutInfo info = layouts.layoutFull(home, paths.distAll, null)
   layouts.layout_core(home, paths.artifacts_core)
   notifyArtifactBuilt(paths.artifacts_core)
   if (buildJps) {
@@ -158,6 +161,7 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps =
   buildMacZip(macAppRoot, macZip, [paths.distAll], paths.distMac)
 
   buildTarGz("idea-${args.buildNumber}", "$paths.artifacts/idea${args.buildNumber}.tar", [paths.distAll, paths.distUnix])
+  return info
 }
 
 private layoutWin(Map args, String home, Paths paths) {
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 3877aedede7d..206a6a91be60 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -252,6 +252,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
   printUnusedModules(info.usedModules)
 
   //reorder(targetDirectory)
+  return info
 }
 
 public def layoutCommunityPlugins(String home) {