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

Compile built-ins with the new compiler in build.xml

Browse Source 
Instead of nested "withKotlin" element in javac2 which launches
bootstrap-compiler, we launch K2JVMCompiler from the newly built compiler
directly
This commit is contained in:
Alexander Udalov
2014-01-24 19:57:06 +04:00
parent 829756dcdb
commit 5e99b77de7
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+34 -18
View File
@@ -526,27 +526,43 @@
</macrodef> </macrodef>
<target name="runtime"> <target name="runtime">
<cleandir dir="${output}/classes/runtime"/> <macrodef name="new_kotlinc">
<javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}"> <attribute name="src"/>
<withKotlin/> <attribute name="output"/>
<src path="${basedir}/core/builtins/src"/> <attribute name="classpath"/>
<src path="${basedir}/core/runtime.jvm/src"/>
</javac2>
<cleandir dir="${output}/classes/stdlib"/> <sequential>
<java classname="org.jetbrains.jet.cli.jvm.K2JVMCompiler" failonerror="true" fork="true"> <cleandir dir="@{output}"/>
<classpath>
<java classname="org.jetbrains.jet.cli.jvm.K2JVMCompiler" failonerror="true" fork="true">
<classpath>
<path refid="classpath"/> <path refid="classpath"/>
<pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/> <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
</classpath> </classpath>
<arg value="-src"/> <arg value="-src"/>
<arg value="${basedir}/libraries/stdlib/src"/> <arg value="@{src}"/>
<arg value="-output"/> <arg value="-output"/>
<arg value="${output}/classes/stdlib"/> <arg value="@{output}"/>
<arg value="-noStdlib"/> <arg value="-noStdlib"/>
<arg value="-classpath"/> <arg value="-classpath"/>
<arg value="${output}/classes/runtime"/> <arg value="@{classpath}"/>
</java> </java>
</sequential>
</macrodef>
<new_kotlinc src="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src"
output="${output}/classes/runtime"
classpath="${basedir}/core/builtins/src${path.separator}${basedir}/core/runtime.jvm/src"/>
<javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
<src path="${basedir}/core/builtins/src"/>
<src path="${basedir}/core/runtime.jvm/src"/>
<classpath location="${output}/classes/runtime"/>
</javac2>
<new_kotlinc src="${basedir}/libraries/stdlib/src"
output="${output}/classes/stdlib"
classpath="${output}/classes/runtime"/>
<jar destfile="${kotlin-home}/lib/kotlin-runtime.jar"> <jar destfile="${kotlin-home}/lib/kotlin-runtime.jar">
<fileset dir="${output}/classes/runtime"/> <fileset dir="${output}/classes/runtime"/>