Fix local installation after #287

Kotlin · Jul 12, 2021 · 4d452db · 4d452db
1 parent 0a03d7e
commit 4d452db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/install.kt b/kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/install.kt
@@ -36,6 +36,7 @@ interface InstallOptions {
     val jarArgsFile: String
     val runKernelDir: String
     val runKernelPy: String
+    val kotlinKernelModule: String
     val setupPy: String
     val kernelFile: String
     val mainClassFQN: String

diff --git a/...n-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/localInstallTasks.kt b/...n-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/localInstallTasks.kt
@@ -8,6 +8,9 @@ fun ProjectWithOptions.prepareLocalTasks() {
         group = localGroup
         dependsOn("cleanInstallDirLocal")
         from(distributionPath.resolve(runKernelDir).resolve(runKernelPy))
+        from(distributionPath.resolve(kotlinKernelModule)) {
+            into(kotlinKernelModule)
+        }
         into(installPathLocal)
     }
 

diff --git a/kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/plugin/options.kt b/kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/plugin/options.kt
@@ -76,6 +76,7 @@ fun Project.options(): AllOptions {
             // Straight slash is used 'cause it's universal across the platforms, and is used in jar_args config
             override val jarArgsFile = "$configDir/jar_args.json"
             override val runKernelPy = "run_kernel.py"
+            override val kotlinKernelModule = "kotlin_kernel"
             override val kernelFile = "kernel.json"
             override val mainClassFQN = "org.jetbrains.kotlinx.jupyter.IkotlinKt"
             override val installKernelTaskPrefix = "installKernel"