make jarjar and proguard optional for faster ant dist

This commit is contained in:
Stepan Koltsov
2012-05-04 19:06:51 +04:00
parent d327777821
commit 15cc3b7d78
+11 -2
View File
@@ -5,6 +5,7 @@
<property name="build.number" value="snapshot"/>
<property name="output.name" value="kotlin-${build.number}"/>
<property name="idea.sdk" value="${basedir}/ideaSDK"/>
<!-- set to false for faster build -->
<import file="build-tools/build.xml" optional="false"/>
@@ -169,7 +170,7 @@
</jar>
</target>
<target name="jarjar">
<target name="jarjar" unless="nojarjar">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
<taskdef resource="proguard/ant/task.properties" classpath="${basedir}/dependencies/proguard.jar"/>
@@ -299,6 +300,14 @@
<delete file="${output}/kotlin-compiler-clean.jar" />
</target>
<target name="nojarjar" unless="nojarjar">
<jar destfile="${output}/kotlin-compiler.jar">
<fileset dir="${output}/classes/compiler"/>
<fileset dir="${output}/classes/runtime"/>
<fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/>
</jar>
</target>
<target name="clean">
<delete dir="${output}"/>
</target>
@@ -317,7 +326,7 @@
<chmod dir="${kotlin-home}/bin" includes="*" perm="755"/>
</target>
<target name="dist" depends="init,copyKotlinJars,jar,buildToolsJar,jarJDKHeaders,jarRT,jarLang,jarjar"/>
<target name="dist" depends="init,copyKotlinJars,jar,buildToolsJar,jarJDKHeaders,jarRT,jarLang,jarjar,nojarjar"/>
<target name="doc" depends="dist"/>