Using the version of ASM that has debug information in it

No more need for extra ASM jars (analysis and util)
This commit is contained in:
Andrey Breslav
2013-05-21 13:01:31 +04:00
parent 97c33b02ab
commit a2b82095da
8 changed files with 15 additions and 34 deletions
+13 -14
View File
@@ -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>