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

Fix wasm binary output paths

Browse Source
This commit is contained in:
Ilya Matveev
2018-08-24 21:47:35 +07:00
committed by Ilya Matveev
parent 36e8f84797
commit 440f6996d2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+7 -7
View File
@@ -109,14 +109,14 @@ class NewMultiplatformIT : BaseGradleIT() {
Assert.assertTrue(resolve("sample-app.klib").exists()) Assert.assertTrue(resolve("sample-app.klib").exists())
} }
assertFileExists("build/bin/wasm32/main/debug/main.wasm.js") assertFileExists("build/bin/wasm32/main/debug/executable/sample_app.wasm.js")
assertFileExists("build/bin/wasm32/main/debug/main.wasm") assertFileExists("build/bin/wasm32/main/debug/executable/sample_app.wasm")
assertFileExists("build/bin/wasm32/main/release/main.wasm.js") assertFileExists("build/bin/wasm32/main/release/executable/sample_app.wasm.js")
assertFileExists("build/bin/wasm32/main/release/main.wasm") assertFileExists("build/bin/wasm32/main/release/executable/sample_app.wasm")
val nativeExeName = if (isWindows) "main.exe" else "main.kexe" val nativeExeName = if (isWindows) "sample-app.exe" else "sample-app.kexe"
assertFileExists("build/bin/$hostTargetName/main/release/$nativeExeName") assertFileExists("build/bin/$hostTargetName/main/release/executable/$nativeExeName")
assertFileExists("build/bin/$hostTargetName/main/debug/$nativeExeName") assertFileExists("build/bin/$hostTargetName/main/debug/executable/$nativeExeName")
} }
build("assemble", "resolveRuntimeDependencies") { build("assemble", "resolveRuntimeDependencies") {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+6 -2
View File
@@ -31,12 +31,14 @@ import org.gradle.nativeplatform.test.tasks.RunTestExecutable
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.plugin.sources.getSourceSetHierarchy 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.KonanCompilerDownloadTask
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import org.jetbrains.kotlin.konan.target.CompilerOutputKind import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.io.File import java.io.File
import java.util.* import java.util.*
import java.util.concurrent.Callable import java.util.concurrent.Callable
@@ -445,7 +447,9 @@ open class KotlinNativeTargetConfigurator(
var filename = "$prefix$baseName$suffix" var filename = "$prefix$baseName$suffix"
if (outputKind == CompilerOutputKind.FRAMEWORK || if (outputKind == CompilerOutputKind.FRAMEWORK ||
outputKind == CompilerOutputKind.STATIC || outputKind == CompilerOutputKind.STATIC ||
outputKind == CompilerOutputKind.DYNAMIC) { outputKind == CompilerOutputKind.DYNAMIC ||
outputKind == CompilerOutputKind.PROGRAM && konanTarget == KonanTarget.WASM32
) {
filename = filename.replace('-', '_') 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) tasks.create(target.artifactsTaskName)
target.compilations.all { target.compilations.all {
createKlibCompilationTask(it) createKlibCompilationTask(it)