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

Tune jline library pack

Browse Source 
- Don't filter out properties files
- Don't filter out dlls
- Keep everything in org.fusesource.* - after processing with proguard there's a native exception on Windows 7 64bit
- Don't warn about missing dependencies from org.fusesource as jline documentation proclaims absence of any dependencies
- Remove jansi from dependencies

  #KT-3047 Fixed
This commit is contained in:
Nikolay Krasko
2012-11-26 14:32:23 +04:00
parent 21b9835dc5
commit 0207693cec
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+5 -1
View File
@@ -220,7 +220,6 @@
<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-util-4.0.jar"/>
<zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-analysis-4.0.jar"/>
@@ -288,9 +287,11 @@
<fileset dir="${output}/kotlin-compiler.exploded">
<include name="**/*.class"/>
<include name="**/*.properties"/>
<include name="**/*.jet"/>
<include name="**/*.kt"/>
<include name="META-INF/services/**"/>
<include name="META-INF/native/**"/>
<include name="messages/**"/>
</fileset>
<zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
@@ -307,6 +308,7 @@
-dontwarn org.jetbrains.jet.internal.com.intellij.util.**
-dontwarn org.jetbrains.jet.internal.com.intellij.codeInsight.**
-dontwarn org.jetbrains.jet.internal.com.thoughtworks.xstream.**
-dontwarn org.fusesource.**
-libraryjars '${rtjar}'
@@ -314,6 +316,8 @@
-dontoptimize
-dontobfuscate
-keep class org.fusesource.** { *; }
-keepclasseswithmembers public class * {
public static void main(java.lang.String[]);
}
update_dependencies.xml
+2
View File
@@ -87,6 +87,7 @@
<copy file="dependencies/download/jline-2.6-sources.jar" tofile="dependencies/jline-sources.jar" overwrite="true"/>
<!-- jansi -->
<!--
<get src="http://repository.jetbrains.com/remote-repos/org/fusesource/jansi/jansi/1.9/jansi-1.9.jar"
dest="dependencies/download/jansi-1.9.jar" usetimestamp="true"/>
<copy file="dependencies/download/jansi-1.9.jar" tofile="dependencies/jansi.jar" overwrite="true"/>
@@ -94,6 +95,7 @@
<get src="http://repository.jetbrains.com/remote-repos/org/fusesource/jansi/jansi/1.9/jansi-1.9-sources.jar"
dest="dependencies/download/jansi-1.9-sources.jar" usetimestamp="true"/>
<copy file="dependencies/download/jansi-1.9-sources.jar" tofile="dependencies/jansi-sources.jar" overwrite="true"/>
-->
<!-- Guava 12 sources-->
<get src="http://search.maven.org/remotecontent?filepath=com/google/guava/guava/12.0/guava-12.0-sources.jar"