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

Add stdlib, etc. to the script dependencies on compilation

Browse Source 
#KT-29293 fixed
This commit is contained in:
Ilya Chernikov
2019-01-15 13:43:26 +01:00
parent cf5657e916
commit 086c4fd5b9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
+9 -4
View File
@@ -109,7 +109,12 @@ class KJvmCompilerImpl(val hostConfiguration: ScriptingHostConfiguration) : KJvm
} }
) )
} }
fun addRoot(moduleName: String, file: File) {
// TODO: implement logic similar to compiler's -no-stdlib (and -no-reflect?)
val standardLibs = arrayListOf("kotlin.stdlib" to KotlinJars.stdlib)
KotlinJars.scriptRuntimeOrNull?.let { standardLibs.add("kotlin.script.runtime" to it) }
for ((moduleName, file) in standardLibs) {
if (isModularJava) { if (isModularJava) {
add(CLIConfigurationKeys.CONTENT_ROOTS, JvmModulePathRoot(file)) add(CLIConfigurationKeys.CONTENT_ROOTS, JvmModulePathRoot(file))
add(JVMConfigurationKeys.ADDITIONAL_JAVA_MODULES, moduleName) add(JVMConfigurationKeys.ADDITIONAL_JAVA_MODULES, moduleName)
@@ -117,9 +122,9 @@ class KJvmCompilerImpl(val hostConfiguration: ScriptingHostConfiguration) : KJvm
add(CLIConfigurationKeys.CONTENT_ROOTS, JvmClasspathRoot(file)) add(CLIConfigurationKeys.CONTENT_ROOTS, JvmClasspathRoot(file))
} }
} }
// TODO: implement logic similar to compiler's -no-stdlib (and -no-reflect?) updatedConfiguration = ScriptCompilationConfiguration(updatedConfiguration) {
addRoot("kotlin.stdlib", KotlinJars.stdlib) dependencies.append(JvmDependency(standardLibs.map { it.second }))
KotlinJars.scriptRuntimeOrNull?.let { addRoot("kotlin.script.runtime", it) } }
put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script") // TODO" take meaningful and valid name from somewhere put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script") // TODO" take meaningful and valid name from somewhere
languageVersionSettings = LanguageVersionSettingsImpl( languageVersionSettings = LanguageVersionSettingsImpl(