From a1584377bfd1c2a930fe8cda00d976772edca161 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 6 Oct 2016 11:10:31 +0300
Subject: [PATCH] Do not pack IDEA core libraries into one idea-core-all.jar in
 pack-compiler

This is no longer needed because there's no more jsr166e.jar in IDEA core
libraries, which was the reason for the original change.

This reverts commit 9a762e0fa282deac1ca48ee15e548325b1e7ab2b.
---
 build.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index c46773bad15..453101d4cdd 100644
--- a/build.xml
+++ b/build.xml
@@ -505,13 +505,6 @@
         <attribute name="compress" default="true"/>
 
         <sequential>
-            <local name="idea.core.uberjar.exists"/>
-            <available file="${dependencies.dir}/idea/idea-core-all.jar" property="idea.core.uberjar.exists"/>
-            <!-- TODO: move this jar creation to update_dependencies.xml eventually -->
-            <jar jarfile="${dependencies.dir}/idea/idea-core-all.jar" unless:true="${idea.core.uberjar.exists}">
-                <zipgroupfileset dir="${idea.sdk}/core" includes="*.jar" excludes="util.jar"/>
-            </jar>
-
             <jar jarfile="@{jarfile}" compress="@{compress}" duplicate="preserve">
                 <fileset dir="${output}/classes/compiler"/>
                 <fileset dir="${output}/builtins">
@@ -530,7 +523,7 @@
                 </fileset>
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-                <zipfileset src="${dependencies.dir}/idea/idea-core-all.jar" excludes="META-INF/INDEX.LIST"/>
+                <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
                 <zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
                 <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
                 <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>