Another workaround for IDEA shared source root limitation
This commit is contained in:
@@ -10,6 +10,7 @@ configurePublishing(project)
|
|||||||
|
|
||||||
|
|
||||||
def builtinsSrcDir = "${buildDir}/builtin-sources"
|
def builtinsSrcDir = "${buildDir}/builtin-sources"
|
||||||
|
def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
|
||||||
def commonSrcDir = "${buildDir}/common-sources"
|
def commonSrcDir = "${buildDir}/common-sources"
|
||||||
def commonTestSrcDir = "${buildDir}/common-test-sources"
|
def commonTestSrcDir = "${buildDir}/common-test-sources"
|
||||||
def builtinsDir = "${rootDir}/../core/builtins"
|
def builtinsDir = "${rootDir}/../core/builtins"
|
||||||
@@ -22,15 +23,9 @@ def jsTestOutputFile = "${buildDir}/classes/test/kotlin-stdlib-js_test.js"
|
|||||||
def kotlinTestJsOutputFile = "${project(':kotlin-test:kotlin-test-js').buildDir}/classes/main/kotlin-test.js"
|
def kotlinTestJsOutputFile = "${project(':kotlin-test:kotlin-test-js').buildDir}/classes/main/kotlin-test.js"
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
builtinsFiles {
|
|
||||||
kotlin {
|
|
||||||
srcDir "${builtinsDir}/native/kotlin/"
|
|
||||||
include "Comparable.kt"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
builtins {
|
builtins {
|
||||||
kotlin {
|
kotlin {
|
||||||
source builtinsFiles.kotlin
|
srcDir builtinsSrcDir2
|
||||||
srcDir "${jsSrcDir}/builtins"
|
srcDir "${jsSrcDir}/builtins"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -59,6 +54,16 @@ dependencies {
|
|||||||
createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
|
createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
|
||||||
createPreprocessorTask(project, "Test", "${projectDir}/../test", commonTestSrcDir)
|
createPreprocessorTask(project, "Test", "${projectDir}/../test", commonTestSrcDir)
|
||||||
|
|
||||||
|
task prepareComparableSource(type: Copy) {
|
||||||
|
doFirst {
|
||||||
|
delete builtinsSrcDir2
|
||||||
|
}
|
||||||
|
from("${builtinsDir}/native/kotlin") {
|
||||||
|
include "Comparable.kt"
|
||||||
|
}
|
||||||
|
into builtinsSrcDir2
|
||||||
|
}
|
||||||
|
|
||||||
task prepareBuiltinsSources(type: Copy) {
|
task prepareBuiltinsSources(type: Copy) {
|
||||||
doFirst {
|
doFirst {
|
||||||
delete builtinsSrcDir
|
delete builtinsSrcDir
|
||||||
@@ -99,6 +104,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileBuiltinsKotlin2Js {
|
compileBuiltinsKotlin2Js {
|
||||||
|
dependsOn prepareComparableSource
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
metaInfo = false
|
metaInfo = false
|
||||||
outputFile = "${buildDir}/classes/builtins/kotlin.js"
|
outputFile = "${buildDir}/classes/builtins/kotlin.js"
|
||||||
|
|||||||
Reference in New Issue
Block a user