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

Revert "do not rename classes when -Dshrink=false"

Browse Source 
It didn't work because KDoc explicitly uses renamed classes like
org.jetbrains.jet.internal.com.intellij.psi.PsiFile

This reverts commit eeac9a8afe.
This commit is contained in:
Stepan Koltsov
2012-06-14 21:28:50 +04:00
parent eeac9a8afe
commit 4ebefd756d
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+23 -26
View File
@@ -165,7 +165,7 @@
</javac> </javac>
<!-- JarJar Kotlin compiler & dependencies --> <!-- JarJar Kotlin compiler & dependencies -->
<jarjar jarfile="${output}/kotlin-compiler-jarjar-zapped.jar"> <jarjar jarfile="${output}/kotlin-compiler-jarjar.jar">
<fileset dir="${output}/classes/compiler"/> <fileset dir="${output}/classes/compiler"/>
<fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/> <fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/>
@@ -190,30 +190,6 @@
<zap pattern="org.mozilla.javascript.xml.impl.xmlbeans.**"/> <zap pattern="org.mozilla.javascript.xml.impl.xmlbeans.**"/>
<manifest>
<attribute name="Built-By" value="JetBrains"/>
<attribute name="Implementation-Vendor" value="JetBrains"/>
<attribute name="Implementation-Title" value="Kotlin Compiler"/>
<attribute name="Implementation-Version" value="${build.number}"/>
<attribute name="Main-Class" value="org.jetbrains.jet.cli.jvm.K2JVMCompiler"/>
</manifest>
</jarjar>
<delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
<if>
<isfalse value="${shrink}"/>
<then>
<copy file="${output}/kotlin-compiler-jarjar-zapped.jar"
tofile="${kotlin-home}/lib/kotlin-compiler.jar"/>
</then>
<else>
<jarjar jarfile="${output}/kotlin-compiler-jarjar-ruled.jar">
<zipgroupfileset dir="${output}" includes="kotlin-compiler-jarjar-zapped.jar"/>
<rule pattern="com.intellij.**" result="org.jetbrains.jet.internal.com.intellij.@1"/> <rule pattern="com.intellij.**" result="org.jetbrains.jet.internal.com.intellij.@1"/>
<rule pattern="com.sun.jna.**" result="org.jetbrains.jet.internal.com.sun.jna.@1"/> <rule pattern="com.sun.jna.**" result="org.jetbrains.jet.internal.com.sun.jna.@1"/>
<rule pattern="org.apache.log4j.**" result="org.jetbrains.jet.internal.org.apache.log4j.@1"/> <rule pattern="org.apache.log4j.**" result="org.jetbrains.jet.internal.org.apache.log4j.@1"/>
@@ -231,10 +207,31 @@
<rule pattern="org.mozilla.**" result="org.jetbrains.jet.internal.org.mozilla.@1"/> <rule pattern="org.mozilla.**" result="org.jetbrains.jet.internal.org.mozilla.@1"/>
<rule pattern="org.xmlpull.**" result="org.jetbrains.jet.internal.org.xmlpull.@1"/> <rule pattern="org.xmlpull.**" result="org.jetbrains.jet.internal.org.xmlpull.@1"/>
<rule pattern="org.kohsuke.args4j.**" result="org.jetbrains.jet.internal.org.kohsuke.args4j.@1"/> <rule pattern="org.kohsuke.args4j.**" result="org.jetbrains.jet.internal.org.kohsuke.args4j.@1"/>
<manifest>
<attribute name="Built-By" value="JetBrains"/>
<attribute name="Implementation-Vendor" value="JetBrains"/>
<attribute name="Implementation-Title" value="Kotlin Compiler"/>
<attribute name="Implementation-Version" value="${build.number}"/>
<attribute name="Main-Class" value="org.jetbrains.jet.cli.jvm.K2JVMCompiler"/>
</manifest>
</jarjar> </jarjar>
<delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
<if>
<isfalse value="${shrink}"/>
<then>
<copy file="${output}/kotlin-compiler-jarjar.jar"
tofile="${kotlin-home}/lib/kotlin-compiler.jar"/>
</then>
<else>
<cleandir dir="${output}/kotlin-compiler.exploded"/> <cleandir dir="${output}/kotlin-compiler.exploded"/>
<unzip src="${output}/kotlin-compiler-jarjar-ruled.jar" dest="${output}/kotlin-compiler.exploded"/> <unzip src="${output}/kotlin-compiler-jarjar.jar" dest="${output}/kotlin-compiler.exploded"/>
<!-- Clean JarJar result --> <!-- Clean JarJar result -->
<jar jarfile="${output}/kotlin-compiler-before-proguard.jar" <jar jarfile="${output}/kotlin-compiler-before-proguard.jar"