From a2b82095dae43057e11827045be3618704a7b4e6 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 21 May 2013 13:01:31 +0400
Subject: [PATCH] Using the version of ASM that has debug information in it

No more need for extra ASM jars (analysis and util)
---
 .idea/artifacts/KotlinPlugin.xml  |  1 -
 .idea/libraries/asm.xml           |  2 +-
 .idea/libraries/asm_addons.xml    | 12 ------------
 build.xml                         |  4 +---
 compiler/backend/backend.iml      |  1 -
 compiler/cli/cli.iml              |  1 -
 compiler/tests/compiler-tests.iml |  1 -
 update_dependencies.xml           | 27 +++++++++++++--------------
 8 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 .idea/libraries/asm_addons.xml

diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 778180015dc..41a47a34c35 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -4,7 +4,6 @@
     <root id="root">
       <element id="directory" name="Kotlin">
         <element id="directory" name="lib">
-          <element id="library" level="project" name="asm-addons" />
           <element id="archive" name="kotlin-plugin.jar">
             <element id="module-output" name="backend" />
             <element id="module-output" name="frontend" />
diff --git a/.idea/libraries/asm.xml b/.idea/libraries/asm.xml
index 8968222f967..13003cfe5f2 100644
--- a/.idea/libraries/asm.xml
+++ b/.idea/libraries/asm.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="asm">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/asm4-all.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-debug-all-4.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/asm_addons.xml b/.idea/libraries/asm_addons.xml
deleted file mode 100644
index 7488a22044c..00000000000
--- a/.idea/libraries/asm_addons.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="asm-addons">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-util-4.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-analysis-4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-all-4.0-src.zip!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 632c0352eb8..182b6655096 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,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-util-4.0.jar"/>
         <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
     </path>
 
@@ -276,8 +275,7 @@
               <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="oromatcher.jar"/>
               <zipgroupfileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
               <zipgroupfileset dir="${basedir}/dependencies" includes="jline.jar"/>
-              <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-analysis-4.0.jar"/>
-  
+
               <manifest>
                   <attribute name="Built-By" value="JetBrains"/>
   
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index 9dd4449bbb4..e1b68dd0487 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -9,7 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="asm-addons" level="project" />
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 3fc055ccfc9..f67af7c8ec3 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="library" name="asm-addons" level="project" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
     <orderEntry type="module" module-name="cli-common" exported="" />
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index da889f38b4b..c29422b9f46 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -14,7 +14,6 @@
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
     <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="asm-addons" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
   </component>
 </module>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 3fc8c81ac46..b3fe11a630b 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -123,28 +123,20 @@
     <macrodef name="get-asm4-and-rename-packages">
         <sequential>
             <!-- Download vanilla ASM 4.0 & unzip the needed jars and sources -->
-            <get-maven-library prefix="org/ow2/asm" lib="asm-analysis" version="4.0" src="false"/>
-            <get-maven-library prefix="org/ow2/asm" lib="asm-util" version="4.0" src="false"/>
-            <get-maven-library prefix="org/ow2/asm" lib="asm-all" version="4.0" bin="false"/>
+            <get-maven-library prefix="org/ow2/asm" lib="asm-debug-all" version="4.0"/>
 
             <!-- Rename packages in the jars -->
             <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
 
-            <jarjar jarfile="dependencies/jetbrains-asm-util-4.0.jar">
-                <zipfileset src="dependencies/download/asm-util-4.0.jar"/>
-
-                <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
-            </jarjar>
-
-            <jarjar jarfile="dependencies/jetbrains-asm-analysis-4.0.jar">
-                <zipfileset src="dependencies/download/asm-analysis-4.0.jar"/>
+            <jarjar jarfile="dependencies/jetbrains-asm-debug-all-4.0.jar">
+                <zipfileset src="dependencies/download/asm-debug-all-4.0.jar"/>
 
                 <rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
             </jarjar>
 
             <!-- Rename packages in the sources -->
             <delete dir="dependencies/download/asm-src" failonerror="false"/>
-            <unzip src="dependencies/download/asm-all-4.0-sources.jar" dest="dependencies/download/asm-src">
+            <unzip src="dependencies/download/asm-debug-all-4.0-sources.jar" dest="dependencies/download/asm-src">
                 <patternset>
                     <include name="**/*"/>
                 </patternset>
@@ -194,7 +186,7 @@
                     <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/trove4j.jar" dest="${core}/trove4j.jar" usetimestamp="true"/>
 
-                    <get src="@{base.url}/jps/asm4-all.jar" dest="${jps}/asm4-all.jar" usetimestamp="true"/>
+                    <copy file="dependencies/jetbrains-asm-debug-all-4.0.jar" todir="${jps}"/>
                     <get src="@{base.url}/jps/groovy-jps-plugin.jar" dest="${jps}/groovy-jps-plugin.jar" usetimestamp="true"/>
                     <get src="@{base.url}/jps/groovy_rt.jar" dest="${jps}/groovy_rt.jar" usetimestamp="true"/>
                     <get src="@{base.url}/jps/jdom.jar" dest="${jps}/jdom.jar" usetimestamp="true"/>
@@ -227,7 +219,8 @@
             <copy file="ideaSDK/lib/log4j.jar" todir="${core}"/>
             <copy file="ideaSDK/lib/xstream-1.4.3.jar" todir="${core}"/>
             <copy file="ideaSDK/lib/xpp3-1.1.4-min.jar" todir="${core}"/>
-            <copy file="ideaSDK/lib/asm4-all.jar" todir="${core}"/>
+            <copy file="dependencies/jetbrains-asm-debug-all-4.0.jar" todir="${core}"/>
+            <copy file="dependencies/jetbrains-asm-debug-all-4.0.jar" todir="ideaSDK/lib"/>
 
             <!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
             <copy file="ideaSDK/lib/util.jar" todir="${core}"/>
@@ -239,6 +232,12 @@
             -->
             <delete file="ideaSDK/lib/junit.jar"/>
 
+            <!--
+                The asm4-all.jar bundled with IDEA has no debug information in it, and we replace it
+                with jetbrains-asm-debug-all-4.0.jar
+            -->
+            <delete file="ideaSDK/lib/asm4-all.jar"/>
+
         </sequential>
     </macrodef>
 </project>