From 87415cb76952f9c77649400716f0ed16ddcdc6e0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Tue, 30 Apr 2019 19:22:37 +0300 Subject: [PATCH] [JS IR] Help IDEA: Copy stdlib sources instead of sharing --- libraries/kotlin.test/js-ir/build.gradle | 13 +++++++++++-- libraries/stdlib/js-ir/build.gradle | 9 +++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libraries/kotlin.test/js-ir/build.gradle b/libraries/kotlin.test/js-ir/build.gradle index 7b66b34e4bf..32aa071b416 100644 --- a/libraries/kotlin.test/js-ir/build.gradle +++ b/libraries/kotlin.test/js-ir/build.gradle @@ -9,7 +9,16 @@ dependencies { compile project(':kotlin-stdlib-js-ir') } +def jsCommonDir = "${buildDir}/common-js-sources" + +task prepareCommonJsSources(type: Sync) { + from "${projectDir}/../js/src/" + into jsCommonDir +} + compileKotlin2Js { + dependsOn prepareCommonJsSources + kotlinOptions { moduleKind = "umd" freeCompilerArgs = [ @@ -24,7 +33,7 @@ compileKotlin2Js { sourceSets { main { kotlin { - srcDir "${projectDir}/../js/src" + srcDir jsCommonDir } } } @@ -66,4 +75,4 @@ if (project.findProperty("kotlin.stdlib.js.ir.dist")?.toBoolean() == true) { dist { from(jar, sourcesJar) } -} \ No newline at end of file +} diff --git a/libraries/stdlib/js-ir/build.gradle b/libraries/stdlib/js-ir/build.gradle index 951ee07666d..17a13f5d592 100644 --- a/libraries/stdlib/js-ir/build.gradle +++ b/libraries/stdlib/js-ir/build.gradle @@ -57,7 +57,12 @@ task prepareBuiltinsSources(type: Sync) { into builtinsSrcDir } -def jsCommonDir = "${projectDir}/../js" +def jsCommonDir = "${buildDir}/common-js-sources" + +task prepareCommonJsSources(type: Sync) { + from("${projectDir}/../js/") + into jsCommonDir +} sourceSets { main { @@ -79,7 +84,6 @@ sourceSets { } test { kotlin { - srcDir "${rootDir}/libraries/stdlib/js/test" srcDir "${jsCommonDir}/test/" } } @@ -99,6 +103,7 @@ dependencies { compileKotlin2Js { dependsOn prepareNativeBuiltinsSources dependsOn prepareBuiltinsSources + dependsOn prepareCommonJsSources kotlinOptions { outputFile = "${buildDir}/classes/main/kotlin.js"