From 6b4aa26122f1e1c3ec0645dea2461c6ec94c864c Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 24 Jul 2012 22:44:17 +0400
Subject: [PATCH] Main part of ASM 4.0 with renamed packages is now taken
 directly from IDEA distribution

---
 .idea/libraries/intellij_core.xml | 1 -
 build.xml                         | 2 --
 update_dependencies.xml           | 9 ++++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.idea/libraries/intellij_core.xml b/.idea/libraries/intellij_core.xml
index 89612d71fb2..edd24bf65c9 100644
--- a/.idea/libraries/intellij_core.xml
+++ b/.idea/libraries/intellij_core.xml
@@ -2,7 +2,6 @@
   <library name="intellij-core">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/ideaSDK/core" />
-      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-all-4.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/build.xml b/build.xml
index 23c6fb172ff..f4fe41b343a 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,6 @@
         <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jline.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jansi.jar"/>
-        <fileset dir="${basedir}/dependencies" includes="jetbrains-asm-all-4.0.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jetbrains-asm-util-4.0.jar"/>
         <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
     </path>
@@ -215,7 +214,6 @@
             <zipgroupfileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jline.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jansi.jar"/>
-            <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-all-4.0.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-util-4.0.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-analysis-4.0.jar"/>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index d78fd8c92db..bbf86bbeac5 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -112,10 +112,10 @@
             <unzip src="dependencies/download/asm-4.0-bin.zip" dest="dependencies/download/asm">
                 <patternset>
                     <include name="asm-4.0/lib/asm-util-4.0.jar"/>
-                    <include name="asm-4.0/lib/asm-tree-4.0.jar"/>
-                    <include name="asm-4.0/lib/asm-commons-4.0.jar"/>
+                    <!--<include name="asm-4.0/lib/asm-tree-4.0.jar"/>-->
+                    <!--<include name="asm-4.0/lib/asm-commons-4.0.jar"/>-->
                     <include name="asm-4.0/lib/asm-analysis-4.0.jar"/>
-                    <include name="asm-4.0/lib/asm-4.0.jar"/>
+                    <!--<include name="asm-4.0/lib/asm-4.0.jar"/>-->
                     <include name="asm-4.0/src.zip"/>
                 </patternset>
                 <mapper type="flatten"/>
@@ -128,6 +128,7 @@
 
             <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
 
+            <!--
             <jarjar jarfile="dependencies/jetbrains-asm-all-4.0.jar">
                 <zipfileset src="dependencies/download/asm/asm-tree-4.0.jar"/>
                 <zipfileset src="dependencies/download/asm/asm-commons-4.0.jar"/>
@@ -135,6 +136,7 @@
 
                 <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
             </jarjar>
+            -->
 
             <jarjar jarfile="dependencies/jetbrains-asm-util-4.0.jar">
                 <zipfileset src="dependencies/download/asm/asm-util-4.0.jar"/>
@@ -193,6 +195,7 @@
             <copy file="ideaSDK/lib/log4j.jar" todir="${core}"/>
             <copy file="ideaSDK/lib/xstream.jar" todir="${core}"/>
             <copy file="ideaSDK/lib/xpp3-1.1.4-min.jar" todir="${core}"/>
+            <copy file="ideaSDK/lib/asm4-all.jar" todir="${core}"/>
 
             <!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
             <copy file="ideaSDK/lib/util.jar" todir="${core}"/>