From 92be12f27b59b514cbc8b423a2a7f3fd46fa13bc Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Sun, 9 Jun 2019 14:31:13 +0300
Subject: [PATCH] IDE, wizards, kotlin jvm server / js client: fix jvmJar
 configuration

There should be `from(new File(jsBrowserWebpack.entry.name, jsBrowserWebpack.outputPath))`
instead of `from(jsBrowserWebpack.outputPath)in jvmJar task configuration`.

`jsBrowserWebpack.outputPath` may be (and will) inside the same dir as
jvmJar. So jvmJar build hangs.
---
 .../configuration/KotlinGradleWebMultiplatformModuleBuilder.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
index aed99daa495..e6c72d78fff 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
@@ -264,7 +264,7 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
 
             jvmJar {
                 dependsOn(jsBrowserWebpack)
-                from(jsBrowserWebpack.outputPath)
+                from(new File(jsBrowserWebpack.entry.name, jsBrowserWebpack.outputPath))
             }
             
             task run(type: JavaExec, dependsOn: [jvmJar]) {