From 440f6996d20e83ee6ec8199d6572179f27f1fe40 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Fri, 24 Aug 2018 21:47:35 +0700
Subject: [PATCH] Fix wasm binary output paths

---
 .../jetbrains/kotlin/gradle/NewMultiplatformIT.kt  | 14 +++++++-------
 .../gradle/plugin/KotlinTargetConfigurator.kt      |  8 ++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
index 44182794919..4191f25199c 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
@@ -109,14 +109,14 @@ class NewMultiplatformIT : BaseGradleIT() {
                     Assert.assertTrue(resolve("sample-app.klib").exists())
                 }
 
-                assertFileExists("build/bin/wasm32/main/debug/main.wasm.js")
-                assertFileExists("build/bin/wasm32/main/debug/main.wasm")
-                assertFileExists("build/bin/wasm32/main/release/main.wasm.js")
-                assertFileExists("build/bin/wasm32/main/release/main.wasm")
+                assertFileExists("build/bin/wasm32/main/debug/executable/sample_app.wasm.js")
+                assertFileExists("build/bin/wasm32/main/debug/executable/sample_app.wasm")
+                assertFileExists("build/bin/wasm32/main/release/executable/sample_app.wasm.js")
+                assertFileExists("build/bin/wasm32/main/release/executable/sample_app.wasm")
 
-                val nativeExeName = if (isWindows) "main.exe" else "main.kexe"
-                assertFileExists("build/bin/$hostTargetName/main/release/$nativeExeName")
-                assertFileExists("build/bin/$hostTargetName/main/debug/$nativeExeName")
+                val nativeExeName = if (isWindows) "sample-app.exe" else "sample-app.kexe"
+                assertFileExists("build/bin/$hostTargetName/main/release/executable/$nativeExeName")
+                assertFileExists("build/bin/$hostTargetName/main/debug/executable/$nativeExeName")
             }
 
             build("assemble", "resolveRuntimeDependencies") {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
index 5f7ad3b8271..5cde4812659 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
@@ -31,12 +31,14 @@ import org.gradle.nativeplatform.test.tasks.RunTestExecutable
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.plugin.sources.getSourceSetHierarchy
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KonanCompilerDownloadTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
 import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
 import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.HostManager
+import org.jetbrains.kotlin.konan.target.KonanTarget
 import java.io.File
 import java.util.*
 import java.util.concurrent.Callable
@@ -445,7 +447,9 @@ open class KotlinNativeTargetConfigurator(
             var filename = "$prefix$baseName$suffix"
             if (outputKind == CompilerOutputKind.FRAMEWORK ||
                 outputKind == CompilerOutputKind.STATIC ||
-                outputKind == CompilerOutputKind.DYNAMIC) {
+                outputKind == CompilerOutputKind.DYNAMIC ||
+                outputKind == CompilerOutputKind.PROGRAM && konanTarget == KonanTarget.WASM32
+            ) {
                 filename = filename.replace('-', '_')
             }
 
@@ -570,7 +574,7 @@ open class KotlinNativeTargetConfigurator(
         }
     }
 
-    override fun configureArchivesAndComponent(target: KotlinNativeTarget) : Unit = with(target.project) {
+    override fun configureArchivesAndComponent(target: KotlinNativeTarget): Unit = with(target.project) {
         tasks.create(target.artifactsTaskName)
         target.compilations.all {
             createKlibCompilationTask(it)