Serialize built-ins on 'ant dist'
Don't store binary data in the repository anymore. From now on any test on the compiler requires that 'ant dist' was executed at least once since the last update of the built-ins
This commit is contained in:
@@ -270,6 +270,19 @@
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="builtins">
|
||||
<cleandir dir="${output}/builtins"/>
|
||||
<java classname="org.jetbrains.jet.utils.builtinsSerializer.BuiltinsSerializerPackage">
|
||||
<classpath>
|
||||
<path refid="classpath"/>
|
||||
<pathelement location="${bootstrap.compiler.home}/lib/kotlin-compiler.jar"/>
|
||||
</classpath>
|
||||
<arg value="${output}/builtins"/>
|
||||
<arg value="core/builtins/native"/>
|
||||
<arg value="core/builtins/src"/>
|
||||
</java>
|
||||
</target>
|
||||
|
||||
<macrodef name="pack_compiler">
|
||||
<attribute name="jarfile"/>
|
||||
<attribute name="compress" default="true"/>
|
||||
@@ -277,7 +290,7 @@
|
||||
<sequential>
|
||||
<jar jarfile="@{jarfile}" compress="@{compress}">
|
||||
<fileset dir="${output}/classes/compiler"/>
|
||||
<fileset dir="${basedir}/compiler/frontend/builtins" includes="jet/**"/>
|
||||
<fileset dir="${output}/builtins" includes="jet/**"/>
|
||||
<fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
|
||||
|
||||
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
|
||||
@@ -595,15 +608,15 @@
|
||||
|
||||
<!-- builds redistributables from sources -->
|
||||
<target name="dist"
|
||||
depends="clean,init,prepareDist,preloader,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
|
||||
depends="clean,init,prepareDist,preloader,builtins,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
|
||||
|
||||
<!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
|
||||
<target name="dist_quick"
|
||||
depends="clean,init,prepareDist,preloader,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
|
||||
depends="clean,init,prepareDist,preloader,builtins,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
|
||||
|
||||
<!-- builds compiler jar from project out dir -->
|
||||
<target name="dist_quick_compiler_only"
|
||||
depends="init,prepareDist,preloader,compiler_quick"/>
|
||||
depends="init,prepareDist,preloader,builtins,compiler_quick"/>
|
||||
|
||||
<target name="zip" depends="dist">
|
||||
<zip destfile="${output}/${output.name}.zip">
|
||||
|
||||
Reference in New Issue
Block a user