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:
Alexander Udalov
2014-01-22 19:33:12 +04:00
parent 013d226b50
commit e46c54f514
225 changed files with 28 additions and 205 deletions
-4
View File
@@ -1,4 +0,0 @@
*.kotlin_class binary
*.kotlin_class_names binary
*.kotlin_name_table binary
+1
View File
@@ -26,6 +26,7 @@
<element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/jet" />
</element>
<element id="module-output" name="backend-common" />
<element id="library" level="project" name="builtins" />
</element>
<element id="library" level="project" name="javax.inject" />
<element id="directory" name="jps">
+9
View File
@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="builtins">
<CLASSES>
<root url="file://$PROJECT_DIR$/dist/builtins" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
+17 -4
View File
@@ -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">
-5
View File
@@ -17,11 +17,6 @@
package org.jetbrains.jet.utils.builtinsSerializer
import java.io.File
import java.util.ArrayList
// To regenerate built-ins in Kotlin project, launch main() with these arguments:
public val BUILT_INS_DEST_DIR: String = "compiler/frontend/builtins"
public val BUILT_INS_SRC_DIR: String = "idea/builtinsSrc"
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
f2

@@ -1,3 +0,0 @@
j
0B

Binary file not shown.
Binary file not shown.
@@ -1,9 +0,0 @@
& 2

 Z
0B
 Z
&0B
 j
Ć0B

Binary file not shown.
@@ -1,9 +0,0 @@
&2


Z
0B

Z
&0?B

Binary file not shown.
@@ -1,9 +0,0 @@
&$2

Z
0B
Z
&0SB
j
Ć0B
$
Binary file not shown.
@@ -1,9 +0,0 @@
&,2

Z
0B
Z
&0aB
j
Ć0B
,
Binary file not shown.
Binary file not shown.
@@ -1,8 +0,0 @@
&I2

Z
0B
Z &0ŻB
j
Ć0B
I
Binary file not shown.
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More