Migrate build and project configuration to IntelliJ IDEA 12 (Leda) EAP
Major changes: ASM is switched from vanilla 3.3 to a 4.0 with renamed packages, because this is done inside IDEA and we depend on that transitively. Thus the jarjar renaming in build.xml, old library binaries deleted. Also we now depend on exact IDEA build (EAP), not "last successful".
This commit is contained in:
@@ -24,6 +24,8 @@
|
||||
<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>
|
||||
|
||||
@@ -208,9 +210,14 @@
|
||||
|
||||
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
|
||||
<zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar"/>
|
||||
<zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="jna-utils.jar"/>
|
||||
<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="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"/>
|
||||
|
||||
<zap pattern="com.thoughtworks.xstream.converters.extended.ISO8601*"/>
|
||||
<zap pattern="com.thoughtworks.xstream.converters.reflection.CGLIBEnhancedConverter*"/>
|
||||
@@ -293,6 +300,8 @@
|
||||
-injars '${output}/kotlin-compiler-before-proguard.jar'
|
||||
-outjars '${kotlin-home}/lib/kotlin-compiler.jar'
|
||||
|
||||
-dontwarn org.jetbrains.jet.internal.com.intellij.util.**
|
||||
|
||||
-libraryjars '${rtjar}'
|
||||
|
||||
-target 1.6
|
||||
|
||||
Reference in New Issue
Block a user