From 534e8a5c50654078461bbc15c9b4ccfefc4c2d24 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 6 Jun 2017 20:14:09 +0300
Subject: [PATCH] Do not pack useless files into the compiler jar

Do not pack META-INF/services to compiler-quick from out directories
because they're packed from sources anyway in the pack-compiler target.
Also do not pack the "META-INF/jb/$$size$$" and "META-INF/LICENSE" files
found in some IntelliJ libraries. Licenses are not required in binaries,
and previously only the first of them was packed anyway
---
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index e4db33970dc..1ffb5d65990 100644
--- a/build.xml
+++ b/build.xml
@@ -155,6 +155,7 @@
         <include name="js.parser/**"/>
         <include name="js.serializer/**"/>
         <include name="js.dce/**"/>
+        <exclude name="**/META-INF/services/**"/>
     </patternset>
 
     <path id="compilerSources.path">
@@ -373,16 +374,16 @@
                 <zipfileset src="${basedir}/ideaSDK/core/asm-all.jar"/>
                 <zipfileset src="${basedir}/ideaSDK/core/guava-19.0.jar"/>
                 <zipfileset src="${basedir}/ideaSDK/core/intellij-core.jar"/>
-                <zipfileset src="${basedir}/ideaSDK/core/jdom.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/jdom.jar" excludes="META-INF/jb/** META-INF/LICENSE"/>
                 <zipfileset src="${basedir}/ideaSDK/core/jna.jar"/>
-                <zipfileset src="${basedir}/ideaSDK/core/log4j.jar"/>
+                <zipfileset src="${basedir}/ideaSDK/core/log4j.jar" excludes="META-INF/jb/** META-INF/LICENSE"/>
                 <zipfileset src="${basedir}/ideaSDK/core/picocontainer.jar"/>
                 <zipfileset src="${basedir}/ideaSDK/core/snappy-in-java-0.5.1.jar"/>
                 <zipfileset src="${basedir}/ideaSDK/core/trove4j.jar"/>
                 <zipfileset src="${basedir}/ideaSDK/core/xpp3-1.1.4-min.jar"/>
                 <zipfileset src="${basedir}/ideaSDK/core/xstream-1.4.8.jar"/>
                 <zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
-                <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
+                <zipfileset src="${idea.sdk}/lib/oromatcher.jar" excludes="META-INF/jb/** META-INF/LICENSE"/>
                 <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>
                 <zipfileset src="${dependencies}/jline.jar"/>
                 <zipfileset src="${dependencies}/javaslang-2.0.6.jar"/>