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

Add only non-jdk classpath entries from the compiler to script

Browse Source 
remove unnecessary manifest classpath entries in the saved compiled
script jar
This commit is contained in:
Ilya Chernikov
2020-01-20 15:00:32 +01:00
parent 75441386e3
commit dca0a71d9b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt
+4 -2
View File
@@ -26,7 +26,9 @@ interface JvmContentRoot : ContentRoot {
val file: File
}
data class JvmClasspathRoot(override val file: File) : JvmContentRoot
data class JvmClasspathRoot(override val file: File, val isSdkRoot: Boolean) : JvmContentRoot {
constructor(file: File) : this(file, false)
}
data class JavaSourceRoot(override val file: File, val packagePrefix: String?) : JvmContentRoot
@@ -41,7 +43,7 @@ fun CompilerConfiguration.addJvmClasspathRoots(files: List<File>) {
}
fun CompilerConfiguration.addJvmSdkRoots(files: List<File>) {
addAll(CLIConfigurationKeys.CONTENT_ROOTS, 0, files.map(::JvmClasspathRoot))
addAll(CLIConfigurationKeys.CONTENT_ROOTS, 0, files.map { file -> JvmClasspathRoot(file, true) })
}
val CompilerConfiguration.jvmClasspathRoots: List<File>