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

[minor] implement automatic stdlib-jdkX jars handling in KotlinPaths

Browse Source 
fixes some local testing scenarios
This commit is contained in:
Ilya Chernikov
2021-01-22 14:26:16 +01:00
parent 76b2ca2e96
commit e0297cf207
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt
+14 -3
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.utils
import java.io.File
import java.lang.IllegalStateException
import com.intellij.openapi.util.SystemInfo
interface KotlinPaths {
val homePath: File
@@ -83,6 +84,8 @@ interface KotlinPaths {
enum class Jar(val baseName: String) {
StdLib(PathUtil.KOTLIN_JAVA_STDLIB_NAME),
StdLibJdk7(PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME),
StdLibJdk8(PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME),
Reflect(PathUtil.KOTLIN_JAVA_REFLECT_NAME),
ScriptRuntime(PathUtil.KOTLIN_JAVA_SCRIPT_RUNTIME_NAME),
KotlinTest(PathUtil.KOTLIN_TEST_NAME),
@@ -106,17 +109,25 @@ interface KotlinPaths {
// TODO: Maybe we need separate classpaths for compilers with and without the daemon
enum class ClassPaths(val contents: List<Jar> = emptyList()) {
Empty(),
Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon),
StdLib(Jar.StdLib, gen = {
when {
SystemInfo.isJavaVersionAtLeast(1, 8, 0) -> listOf(Jar.StdLibJdk7, Jar.StdLibJdk8)
SystemInfo.isJavaVersionAtLeast(1, 7, 0) -> listOf(Jar.StdLibJdk7)
else -> emptyList()
}
}),
Compiler(StdLib, Jar.Compiler, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon),
CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib),
MainKts(Jar.MainKts, Jar.ScriptRuntime, Jar.StdLib, Jar.Reflect)
MainKts(StdLib, Jar.MainKts, Jar.ScriptRuntime, Jar.Reflect)
;
constructor(vararg jars: Jar) : this(jars.asList())
constructor(baseClassPath: ClassPaths, vararg jars: Jar) : this(baseClassPath.contents + jars)
constructor(vararg jars: Jar, gen: () -> List<Jar>) : this(jars.asList() + gen())
}
fun jar(jar: Jar): File
fun sourcesJar(jar: Jar): File?
fun classPath(jars: Sequence<Jar>): List<File> = jars.map(this::jar).toList()