[build] workaround over bcabbcf3e1
This commit is contained in:
committed by
Vasily Levchenko
parent
f056b3cd0a
commit
be6722d44a
@@ -16,19 +16,19 @@ def rootBuildDirectory = rootProject.projectDir
|
||||
|
||||
task konanRun {
|
||||
subprojects.each {
|
||||
dependsOn it.getTasksByName('konanRun', true)[0]
|
||||
dependsOn "${it.path}:konanRun"
|
||||
}
|
||||
}
|
||||
|
||||
task jvmRun {
|
||||
subprojects.each {
|
||||
dependsOn it.getTasksByName('jvmRun', true)[0]
|
||||
dependsOn "${it.path}:jvmRun"
|
||||
}
|
||||
}
|
||||
|
||||
task clean {
|
||||
subprojects.each {
|
||||
dependsOn it.getTasksByName('clean', true)[0]
|
||||
dependsOn "${it.path}:clean"
|
||||
}
|
||||
doLast {
|
||||
delete "${buildDir.absolutePath}"
|
||||
@@ -187,8 +187,10 @@ task mergeJvmReports {
|
||||
}
|
||||
|
||||
subprojects.each {
|
||||
it.getTasksByName('jvmJsonReport', true)[0].finalizedBy mergeJvmReports
|
||||
it.getTasksByName('konanJsonReport', true)[0].finalizedBy mergeNativeReports
|
||||
it.afterEvaluate {
|
||||
it.jvmJsonReport.finalizedBy mergeJvmReports
|
||||
it.konanJsonReport.finalizedBy mergeNativeReports
|
||||
}
|
||||
}
|
||||
|
||||
task teamCityStat(type:Exec) {
|
||||
|
||||
+15
-13
@@ -31,19 +31,21 @@ include ':backend.native:tests'
|
||||
include ':backend.native:debugger-tests'
|
||||
include ':utilities'
|
||||
|
||||
include ':performance'
|
||||
include ':performance:ring'
|
||||
include ':performance:cinterop'
|
||||
include ':performance:helloworld'
|
||||
include ':performance:numerical'
|
||||
include ':performance:videoplayer'
|
||||
include ':performance:framework'
|
||||
if (System.getProperty("os.name") == "Mac OS X") {
|
||||
include ':performance:objcinterop'
|
||||
include ':performance:swiftinterop'
|
||||
if (hasProperty("runExcludedBenchmarks")) {
|
||||
include ':performance:KotlinVsSwift'
|
||||
include ':performance:KotlinVsSwift:ring'
|
||||
if (hasProperty("konan.home") || hasProperty("org.jetbrains.kotlin.native.home")) {
|
||||
include ':performance'
|
||||
include ':performance:ring'
|
||||
include ':performance:cinterop'
|
||||
include ':performance:helloworld'
|
||||
include ':performance:numerical'
|
||||
include ':performance:videoplayer'
|
||||
include ':performance:framework'
|
||||
if (System.getProperty("os.name") == "Mac OS X") {
|
||||
include ':performance:objcinterop'
|
||||
include ':performance:swiftinterop'
|
||||
if (hasProperty("runExcludedBenchmarks")) {
|
||||
include ':performance:KotlinVsSwift'
|
||||
include ':performance:KotlinVsSwift:ring'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user