Revert to default build dirs, add missing projects
This commit is contained in:
+5
-1
@@ -179,7 +179,11 @@ allprojects {
|
|||||||
jvmTarget = defaultJvmTarget
|
jvmTarget = defaultJvmTarget
|
||||||
javaHome = defaultJavaHome
|
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 {
|
repositories {
|
||||||
for (repo in (rootProject.extra["repos"] as List<String>)) {
|
for (repo in (rootProject.extra["repos"] as List<String>)) {
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ dependencies {
|
|||||||
compile project(':kotlin-test:kotlin-test-js')
|
compile project(':kotlin-test:kotlin-test-js')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// package.json contains direct links to the builddir
|
||||||
|
buildDir = "$projectDir/build"
|
||||||
|
|
||||||
[compileKotlin2Js, compileTestKotlin2Js]*.configure {
|
[compileKotlin2Js, compileTestKotlin2Js]*.configure {
|
||||||
kotlinOptions.moduleKind = "commonjs"
|
kotlinOptions.moduleKind = "commonjs"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -88,6 +88,7 @@ include ":kotlin-build-common",
|
|||||||
":kotlin-test:kotlin-test-jvm",
|
":kotlin-test:kotlin-test-jvm",
|
||||||
":kotlin-test:kotlin-test-junit",
|
":kotlin-test:kotlin-test-junit",
|
||||||
":kotlin-test:kotlin-test-js",
|
":kotlin-test:kotlin-test-js",
|
||||||
|
":kotlin-test:kotlin-test-js-it",
|
||||||
":kotlin-stdlib-common",
|
":kotlin-stdlib-common",
|
||||||
":kotlin-stdlib",
|
":kotlin-stdlib",
|
||||||
":kotlin-stdlib-js",
|
":kotlin-stdlib-js",
|
||||||
@@ -129,12 +130,13 @@ include ":kotlin-build-common",
|
|||||||
|
|
||||||
rootProject.name = "kotlin"
|
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-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-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-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-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').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-common').projectDir = "$rootDir/libraries/stdlib/common" as File
|
||||||
project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" as File
|
project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" as File
|
||||||
project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js" as File
|
project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js" as File
|
||||||
|
|||||||
Reference in New Issue
Block a user