From 4b3936b5986f0160c9fb752c11e8bd07193ae712 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 7 Sep 2017 13:03:48 +0300
Subject: [PATCH] Revert to default build dirs, add missing projects

---
 build.gradle.kts                         | 6 +++++-
 libraries/kotlin.test/js/it/build.gradle | 3 +++
 settings.gradle                          | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b77922c4724..c0505092837 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -179,7 +179,11 @@ allprojects {
     jvmTarget = defaultJvmTarget
     javaHome = defaultJavaHome
 
-    buildDir = File(commonBuildDir, project.name)
+    // There are problems with common build dir:
+    //  - some tests (in particular js and binary-compatibility-validator depend on the fixed (default) location
+    //  - idea siims unable to exclude common builddir from indexing
+    // therefore it is disabled by default
+//    buildDir = File(commonBuildDir, project.name)
 
     repositories {
         for (repo in (rootProject.extra["repos"] as List<String>)) {
diff --git a/libraries/kotlin.test/js/it/build.gradle b/libraries/kotlin.test/js/it/build.gradle
index 7b00ce34732..78536151037 100644
--- a/libraries/kotlin.test/js/it/build.gradle
+++ b/libraries/kotlin.test/js/it/build.gradle
@@ -10,6 +10,9 @@ dependencies {
     compile project(':kotlin-test:kotlin-test-js')
 }
 
+// package.json contains direct links to the builddir
+buildDir = "$projectDir/build"
+
 [compileKotlin2Js, compileTestKotlin2Js]*.configure {
     kotlinOptions.moduleKind = "commonjs"
 }
diff --git a/settings.gradle b/settings.gradle
index 3d92e8751be..47f93e8ed97 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -88,6 +88,7 @@ include ":kotlin-build-common",
         ":kotlin-test:kotlin-test-jvm",
         ":kotlin-test:kotlin-test-junit",
         ":kotlin-test:kotlin-test-js",
+        ":kotlin-test:kotlin-test-js-it",
         ":kotlin-stdlib-common",
         ":kotlin-stdlib",
         ":kotlin-stdlib-js",
@@ -129,12 +130,13 @@ include ":kotlin-build-common",
 
 rootProject.name = "kotlin"
 
-//project(':kotlin-runtime').projectDir = "$rootDir/libraries/tools/runtime" as File
+project(':kotlin-runtime').projectDir = "$rootDir/libraries/tools/runtime" as File
 project(':kotlin-script-runtime').projectDir = "$rootDir/libraries/tools/script-runtime" as File
 project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotlin.test/common" as File
 project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/libraries/kotlin.test/jvm" as File
 project(':kotlin-test:kotlin-test-junit').projectDir = "$rootDir/libraries/kotlin.test/junit" as File
 project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File
+project(':kotlin-test:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
 project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File
 project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" as File
 project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js" as File