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

Remove new kotlin daemon from dist

Browse Source 
hopefully temporarily, also see #KTI-173
This commit is contained in:
Ilya Chernikov
2020-05-20 16:07:43 +02:00
parent 3dd79ffea6
commit 574b917061
6 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt
+1 -2
View File
@@ -99,14 +99,13 @@ interface KotlinPaths {
ScriptingJvmLib(PathUtil.KOTLIN_SCRIPTING_JVM_NAME),
CoroutinesCore(PathUtil.KOTLINX_COROUTINES_CORE_NAME),
KotlinDaemon(PathUtil.KOTLIN_DAEMON_NAME),
Ktor(PathUtil.KTOR_NAME),
MainKts(PathUtil.MAIN_KTS_NAME)
}
// 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, Jar.Ktor),
Compiler(Jar.Compiler, Jar.StdLib, 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)
;
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
-1
View File
@@ -69,7 +69,6 @@ object PathUtil {
const val KOTLIN_SCRIPTING_JS_NAME = "kotlin-scripting-js"
const val KOTLIN_SCRIPTING_JS_JAR = "$KOTLIN_SCRIPTING_JS_NAME.jar"
const val KOTLIN_DAEMON_NAME = "kotlin-daemon"
const val KTOR_NAME = "ktor-network-1.0.1"
const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar"
const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler"
const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar"