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

Build kotlin-stdlib in addition to kotlin-runtime in ant build.

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-01-21 00:51:48 +03:00
parent a2bd3bfc7b
commit f9e552e3c2
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TeamCityBuild.xml
+1 -1
View File
@@ -145,7 +145,7 @@
</macrodef> </macrodef>
<target name="printStatistics"> <target name="printStatistics">
<print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-runtime.jar"/> <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.jar"/>
<print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/> <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
<print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-jslib.jar"/> <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-jslib.jar"/>
build.xml
+9 -3
View File
@@ -1062,8 +1062,10 @@
<target name="kotlin-test"> <target name="kotlin-test">
<path id="kotlin-test-compile-classpath"> <path id="kotlin-test-compile-classpath">
<pathelement location="${output}/classes/builtins"/>
<pathelement location="${output}/builtins"/> <pathelement location="${output}/builtins"/>
<pathelement location="${output}/classes/builtins"/>
<pathelement location="${output}/classes/stdlib"/>
<pathelement location="libraries/lib/junit-4.11.jar"/>
</path> </path>
<java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true" maxmemory="${max.heap.size.for.forked.jvm}"> <java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true" maxmemory="${max.heap.size.for.forked.jvm}">
@@ -1088,6 +1090,7 @@
<arg value="-Xmulti-platform"/> <arg value="-Xmulti-platform"/>
<arg value="libraries/kotlin.test/common/src/main/kotlin"/> <arg value="libraries/kotlin.test/common/src/main/kotlin"/>
<arg value="libraries/kotlin.test/jvm/src/main/kotlin"/> <arg value="libraries/kotlin.test/jvm/src/main/kotlin"/>
<arg value="libraries/kotlin.test/junit/src/main/kotlin"/>
</java> </java>
<pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="Test"> <pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}" runtime-component="Test">
@@ -1188,7 +1191,7 @@
</macrodef> </macrodef>
<target name="pack-runtime"> <target name="pack-runtime">
<pack-runtime-jar jar-name="kotlin-runtime.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime}"> <pack-runtime-jar jar-name="kotlin-stdlib.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime}">
<jar-content> <jar-content>
<fileset dir="${output}/classes/builtins"/> <fileset dir="${output}/classes/builtins"/>
<fileset dir="${output}/classes/stdlib"/> <fileset dir="${output}/classes/stdlib"/>
@@ -1199,6 +1202,7 @@
</zipfileset> </zipfileset>
</jar-content> </jar-content>
</pack-runtime-jar> </pack-runtime-jar>
<copy file="${kotlin-home}/lib/kotlin-stdlib.jar" tofile="${kotlin-home}/lib/kotlin-runtime.jar"/>
<pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-before-jarjar.jar" implementation-title="${manifest.impl.title.kotlin.jvm.reflect}"> <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-before-jarjar.jar" implementation-title="${manifest.impl.title.kotlin.jvm.reflect}">
<jar-content> <jar-content>
@@ -1274,7 +1278,7 @@
</replaceregexp> </replaceregexp>
</sequential> </sequential>
<pack-runtime-jar jar-name="kotlin-runtime-sources.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime.sources}"> <pack-runtime-jar jar-name="kotlin-stdlib-sources.jar" implementation-title="${manifest.impl.title.kotlin.jvm.runtime.sources}">
<jar-content> <jar-content>
<fileset dir="${basedir}/core/builtins/native" includes="**/*"/> <fileset dir="${basedir}/core/builtins/native" includes="**/*"/>
<fileset dir="${basedir}/core/builtins/src" includes="**/*"/> <fileset dir="${basedir}/core/builtins/src" includes="**/*"/>
@@ -1284,6 +1288,8 @@
<fileset dir="${output}/core.src" includes="**/*"/> <fileset dir="${output}/core.src" includes="**/*"/>
</jar-content> </jar-content>
</pack-runtime-jar> </pack-runtime-jar>
<copy file="${kotlin-home}/lib/kotlin-stdlib-sources.jar" tofile="${kotlin-home}/lib/kotlin-runtime-sources.jar"/>
<pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-sources-for-maven.jar" <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-sources-for-maven.jar"
implementation-title="${manifest.impl.title.kotlin.jvm.reflect.sources}"> implementation-title="${manifest.impl.title.kotlin.jvm.reflect.sources}">
resources/kotlinManifest.properties
+1 -1
View File
@@ -13,7 +13,7 @@ manifest.impl.title.kotlin.compiler.sources=Kotlin Compiler Sources
manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks
manifest.impl.title.kotlin.jvm.runtime=Kotlin Runtime manifest.impl.title.kotlin.jvm.runtime=Kotlin Standard Library
manifest.impl.title.kotlin.jvm.reflect=Kotlin Reflect manifest.impl.title.kotlin.jvm.reflect=Kotlin Reflect
manifest.impl.title.kotlin.script.runtime=Kotlin Script Runtime manifest.impl.title.kotlin.script.runtime=Kotlin Script Runtime
manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime Sources manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime Sources