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

build.xml: build kotlin-test along with rest of runtime JARs

Browse Source
This commit is contained in:
Alexander Udalov
2016-01-11 20:03:09 +03:00
parent 8c3661c01c
commit f6b5c31e39
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+11 -13
View File
@@ -811,8 +811,8 @@
</new-kotlinc> </new-kotlinc>
</target> </target>
<target name="kotlin.test"> <target name="kotlin-test">
<new-kotlinc output="${output}/classes/kotlin.test" moduleName="kotlin-test"> <new-kotlinc output="${output}/classes/kotlin-test" moduleName="kotlin-test">
<src> <src>
<include name="libraries/kotlin.test/shared/src/main/kotlin" /> <include name="libraries/kotlin.test/shared/src/main/kotlin" />
<include name="libraries/kotlin.test/shared/src/main/kotlin.jvm" /> <include name="libraries/kotlin.test/shared/src/main/kotlin.jvm" />
@@ -823,6 +823,12 @@
<pathelement path="libraries/lib/junit-4.11.jar"/> <pathelement path="libraries/lib/junit-4.11.jar"/>
</class-path> </class-path>
</new-kotlinc> </new-kotlinc>
<pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}">
<jar-content>
<fileset dir="${output}/classes/kotlin-test" includes="**/*" excludes="kotlin/internal/OnlyInputTypes*,kotlin/internal"/>
</jar-content>
</pack-runtime-jar>
</target> </target>
<target name="core"> <target name="core">
@@ -988,23 +994,15 @@
</pack-runtime-jar> </pack-runtime-jar>
</target> </target>
<target name="pack-kotlin-test">
<pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}">
<jar-content>
<fileset dir="${output}/classes/kotlin.test" includes="**/*" excludes="kotlin/internal/OnlyInputTypes*,kotlin/internal"/>
</jar-content>
</pack-runtime-jar>
</target>
<target name="runtime" <target name="runtime"
depends="builtins,stdlib,core,reflection,pack-runtime,pack-runtime-sources"/> depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources"/>
<target name="dist" <target name="dist"
depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin.test,pack-kotlin-test,kotlin-js-stdlib,android-compiler-plugin,daemon-client" depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
description="Builds redistributables from sources"/> description="Builds redistributables from sources"/>
<target name="dist-quick" <target name="dist-quick"
depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin.test,pack-kotlin-test,kotlin-js-stdlib,android-compiler-plugin" depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin"
description="Builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc"/> description="Builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc"/>
<target name="dist-quick-compiler-only" <target name="dist-quick-compiler-only"