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

Load built-ins from module dependencies in JVM compiler

Browse Source 
Introduce a new method KotlinClassFinder#findBuiltInsData, which is only
implemented correctly in the JvmCliVirtualFileFinder because it's only used in
the compiler code at the moment.

Introduce JvmBuiltInsPackageFragmentProvider, the purpose of which is to look
for .kotlin_builtins files in the classpath and provide definitions of
built-ins from those files.

Also exclude script.runtime from compilation because, as other excluded
modules, it has no dependency on the stdlib and is no longer compilable from
the IDE now, because it cannot resolve built-ins from anywhere
This commit is contained in:
Alexander Udalov
2016-10-17 18:11:38 +03:00
parent 0b59c71340
commit e0989caf46
14 changed files with 145 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+13 -3
View File
@@ -961,8 +961,8 @@
<include name="core/runtime.jvm/src"/>
</src>
<class-path>
<!-- Need something to pass to compiler's "-classpath" here -->
<pathelement location="core/builtins/src"/>
<!-- TODO: serialize and compile built-ins in one step here instead -->
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
</target>
@@ -974,6 +974,7 @@
</src>
<class-path>
<pathelement path="${output}/classes/builtins"/>
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
</target>
@@ -988,6 +989,7 @@
<class-path>
<pathelement path="${output}/classes/builtins"/>
<pathelement path="libraries/lib/junit-4.11.jar"/>
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
@@ -1012,6 +1014,7 @@
<pathelement path="${output}/classes/stdlib"/>
<pathelement path="${protobuf-lite.jar}"/>
<pathelement path="${javax.inject.jar}"/>
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
</target>
@@ -1026,6 +1029,7 @@
<pathelement path="${output}/classes/stdlib"/>
<pathelement path="${output}/classes/core"/>
<pathelement path="${protobuf-lite.jar}"/>
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
</target>
@@ -1060,7 +1064,7 @@
<fileset dir="${output}/classes/stdlib"/>
<zipfileset dir="${output}/builtins">
<include name="kotlin/**"/>
<!-- TODO: load metadata from @KotlinClass annotation in KotlinBuiltIns on JVM and restore this exclusion -->
<!-- TODO: load metadata from @Metadata annotation in KotlinBuiltIns on JVM and restore this exclusion (also below in mock-runtime) -->
<!-- exclude name="kotlin/reflect/**"/ -->
</zipfileset>
</jar-content>
@@ -1167,6 +1171,7 @@
</src>
<class-path>
<pathelement path="${output}/classes/builtins"/>
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
<pack-runtime-jar jar-name="kotlin-script-runtime.jar" implementation-title="${manifest.impl.title.kotlin.script.runtime}">
@@ -1225,12 +1230,17 @@
</src>
<class-path>
<pathelement path="${output}/classes/builtins"/>
<pathelement path="${output}/builtins"/>
</class-path>
</new-kotlinc>
<pack-runtime-jar jar-dir="${output}" jar-name="kotlin-mock-runtime-for-test.jar" implementation-title="Kotlin Mock Runtime">
<jar-content>
<fileset dir="${output}/classes/mock-runtime"/>
<zipfileset dir="${output}/builtins">
<include name="kotlin/**"/>
<!-- exclude name="kotlin/reflect/**"/ -->
</zipfileset>
</jar-content>
</pack-runtime-jar>
</target>