azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Main part of ASM 4.0 with renamed packages is now taken directly from IDEA distribution

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-24 22:44:17 +04:00
parent d8632f81aa
commit 6b4aa26122
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/intellij_core.xml
Generated
-1
View File
@@ -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>
build.xml
-2
View File
@@ -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"/>
update_dependencies.xml
+6 -3
View File
@@ -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}"/>