stdlib-js-ir: do not copy source directories from the same project

This commit is contained in:
Ilya Gorbunov
2020-05-13 11:54:16 +03:00
parent 46b0784508
commit 188bcf0e7b
2 changed files with 16 additions and 6 deletions
@@ -57,9 +57,6 @@ val jsMainSources by task<Sync> {
val fullJsMainSources = tasks.getByPath(":kotlin-stdlib-js-ir:jsMainSources") val fullJsMainSources = tasks.getByPath(":kotlin-stdlib-js-ir:jsMainSources")
exclude( exclude(
listOf( listOf(
"libraries/stdlib/js-ir/runtime/collectionsHacks.kt",
"libraries/stdlib/js-ir/src/generated/**",
"libraries/stdlib/js-ir/src/kotlin/text/**",
"libraries/stdlib/js/src/jquery/**", "libraries/stdlib/js/src/jquery/**",
"libraries/stdlib/js/src/org.w3c/**", "libraries/stdlib/js/src/org.w3c/**",
"libraries/stdlib/js/src/kotlin/char.kt", "libraries/stdlib/js/src/kotlin/char.kt",
@@ -87,6 +84,19 @@ val jsMainSources by task<Sync> {
fullJsMainSources.outputs.files.singleFile fullJsMainSources.outputs.files.singleFile
} }
for (jsIrSrcDir in listOf("builtins", "runtime", "src")) {
from("$rootDir/libraries/stdlib/js-ir/$jsIrSrcDir") {
exclude(
listOf(
"collectionsHacks.kt",
"generated/**",
"kotlin/text/**"
)
)
into("libraries/stdlib/js-ir/$jsIrSrcDir")
}
}
from("$rootDir/libraries/stdlib/js-ir-minimal-for-test/src") from("$rootDir/libraries/stdlib/js-ir-minimal-for-test/src")
into("$buildDir/jsMainSources") into("$buildDir/jsMainSources")
} }
+3 -3
View File
@@ -46,9 +46,6 @@ val jsMainSources by task<Sync> {
"core/builtins/src/kotlin/", "core/builtins/src/kotlin/",
"libraries/stdlib/js/src/", "libraries/stdlib/js/src/",
"libraries/stdlib/js/runtime/", "libraries/stdlib/js/runtime/",
"libraries/stdlib/js-ir/builtins/",
"libraries/stdlib/js-ir/src/",
"libraries/stdlib/js-ir/runtime/",
// TODO get rid - move to test module // TODO get rid - move to test module
"js/js.translator/testData/_commonFiles/" "js/js.translator/testData/_commonFiles/"
@@ -109,6 +106,9 @@ kotlin {
} }
val jsMain by getting { val jsMain by getting {
kotlin.srcDir(files(jsMainSources.map { it.destinationDir })) kotlin.srcDir(files(jsMainSources.map { it.destinationDir }))
kotlin.srcDir("builtins")
kotlin.srcDir("runtime")
kotlin.srcDir("src")
} }
val commonTest by getting { val commonTest by getting {
dependencies { dependencies {