Finish off old deprecated function/extension function classes

This reverts commit d14e5b8a72.
This commit is contained in:
Alexander Udalov
2015-06-09 21:38:19 +03:00
parent 5394abc83e
commit 64b60718e3
64 changed files with 5 additions and 1582 deletions
+1 -14
View File
@@ -670,17 +670,6 @@
</new-kotlinc>
</target>
<target name="functions-migration">
<new-kotlinc output="${output}/classes/functions-migration">
<src>
<include name="core/functions.migration/src"/>
</src>
<class-path>
<pathelement path="${output}/classes/builtins"/>
</class-path>
</new-kotlinc>
</target>
<target name="stdlib">
<new-kotlinc output="${output}/classes/stdlib">
<src>
@@ -751,7 +740,6 @@
<pack-runtime-jar jar-name="kotlin-runtime.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime}">
<jar-content>
<fileset dir="${output}/classes/builtins"/>
<fileset dir="${output}/classes/functions-migration"/>
<fileset dir="${output}/classes/stdlib"/>
<zipfileset dir="${output}/builtins">
<include name="kotlin/**"/>
@@ -820,7 +808,6 @@
<jar-content>
<fileset dir="${basedir}/core/builtins/native" includes="**/*"/>
<fileset dir="${basedir}/core/builtins/src" includes="**/*"/>
<fileset dir="${basedir}/core/functions.migration/src" includes="**/*"/>
<fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/>
<fileset dir="${basedir}/core/runtime.jvm/src" includes="**/*"/>
<fileset dir="${basedir}/libraries/stdlib/src" includes="**/*"/>
@@ -838,7 +825,7 @@
</target>
<target name="runtime"
depends="builtins,functions-migration,stdlib,core,reflection,pack-runtime,pack-runtime-sources"/>
depends="builtins,stdlib,core,reflection,pack-runtime,pack-runtime-sources"/>
<target name="dist"
depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin"