Revert to default build dirs, add missing projects

This commit is contained in:
Ilya Chernikov
2017-09-07 13:03:48 +03:00
parent 3262ac0129
commit 4b3936b598
3 changed files with 11 additions and 2 deletions
+5 -1
View File
@@ -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>)) {
+3
View File
@@ -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"
}
+3 -1
View File
@@ -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