From cb186aabf9ab52cbfffaefa58e439a08e4212c8e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 12 Apr 2017 08:10:17 +0300
Subject: [PATCH] Another workaround for IDEA shared source root limitation

---
 libraries/stdlib/js/build.gradle | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index 948ed48e619..bb81969ad53 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -10,6 +10,7 @@ configurePublishing(project)
 
 
 def builtinsSrcDir = "${buildDir}/builtin-sources"
+def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
 def commonSrcDir = "${buildDir}/common-sources"
 def commonTestSrcDir = "${buildDir}/common-test-sources"
 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"
 
 sourceSets {
-    builtinsFiles {
-        kotlin {
-            srcDir "${builtinsDir}/native/kotlin/"
-            include "Comparable.kt"
-        }
-    }
     builtins {
         kotlin {
-            source builtinsFiles.kotlin
+            srcDir builtinsSrcDir2
             srcDir "${jsSrcDir}/builtins"
         }
     }
@@ -59,6 +54,16 @@ dependencies {
 createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
 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) {
     doFirst {
         delete builtinsSrcDir
@@ -99,6 +104,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile) {
 }
 
 compileBuiltinsKotlin2Js {
+    dependsOn prepareComparableSource
     kotlinOptions {
         metaInfo = false
         outputFile = "${buildDir}/classes/builtins/kotlin.js"