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

Build kotlin-stdlib-js.jar in ant

Browse Source 
#KT-15940
This commit is contained in:
Ilya Gorbunov
2017-01-26 05:19:26 +03:00
parent d0e917e7f9
commit 0df31f1223
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TeamCityBuild.xml
+1 -1
View File
@@ -148,7 +148,7 @@
<print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.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-stdlib-js.jar"/>
<print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/> <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
<print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.meta.js}"/> <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.meta.js}"/>
<print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.js}"/> <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="${compiled.stdlib.js}"/>
build.xml
+4 -2
View File
@@ -450,7 +450,7 @@
<arg line="js-stdlib-merge" /> <arg line="js-stdlib-merge" />
</java> </java>
<jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar" duplicate="fail"> <jar jarfile="${kotlin-home}/lib/kotlin-stdlib-js.jar" duplicate="fail">
<zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/> <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
<zipfileset dir="${js.stdlib.output.dir}" prefix=""> <zipfileset dir="${js.stdlib.output.dir}" prefix="">
<include name="kotlin.js"/> <include name="kotlin.js"/>
@@ -469,10 +469,11 @@
<attribute name="Specification-Title" value="${manifest.spec.title.kotlin.javascript.lib}"/> <attribute name="Specification-Title" value="${manifest.spec.title.kotlin.javascript.lib}"/>
</manifest> </manifest>
</jar> </jar>
<copy file="${kotlin-home}/lib/kotlin-stdlib-js.jar" tofile="${kotlin-home}/lib/kotlin-jslib.jar" />
</target> </target>
<target name="pack-js-stdlib-sources"> <target name="pack-js-stdlib-sources">
<jar destfile="${kotlin-home}/lib/kotlin-jslib-sources.jar" duplicate="fail"> <jar destfile="${kotlin-home}/lib/kotlin-stdlib-js-sources.jar" duplicate="fail">
<resources refid="js.lib.files" /> <resources refid="js.lib.files" />
<fileset refid="kotlin.builtin.files" /> <fileset refid="kotlin.builtin.files" />
@@ -486,6 +487,7 @@
<attribute name="Implementation-Version" value="${build.number}"/> <attribute name="Implementation-Version" value="${build.number}"/>
</manifest> </manifest>
</jar> </jar>
<copy file="${kotlin-home}/lib/kotlin-stdlib-js-sources.jar" tofile="${kotlin-home}/lib/kotlin-jslib-sources.jar" />
</target> </target>
<target name="kotlin-js-stdlib" depends="js-stdlib,js-kotlin-test,pack-js-stdlib-sources"/> <target name="kotlin-js-stdlib" depends="js-stdlib,js-kotlin-test,pack-js-stdlib-sources"/>
libraries/tools/kotlin-js-library/pom.xml
+2 -2
View File
@@ -26,10 +26,10 @@
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<tasks> <tasks>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib.jar" <copy file="${kotlin-dist}/kotlinc/lib/kotlin-stdlib-js.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}.jar" tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
overwrite="true" verbose="true"/> overwrite="true" verbose="true"/>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar" <copy file="${kotlin-dist}/kotlinc/lib/kotlin-stdlib-js-sources.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar" tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
overwrite="true" verbose="true"/> overwrite="true" verbose="true"/>
</tasks> </tasks>
node_utils.xml
+1 -1
View File
@@ -118,6 +118,6 @@
<!-- Used on TeamCity--> <!-- Used on TeamCity-->
<target name="unzip-jslib.jar"> <target name="unzip-jslib.jar">
<unzip src="${output}/kotlinc/lib/kotlin-jslib.jar" dest="${js.stdlib.output.dir}"/> <unzip src="${output}/kotlinc/lib/kotlin-stdlib-js.jar" dest="${js.stdlib.output.dir}"/>
</target> </target>
</project> </project>