azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] workaround over bcabbcf3e1

Browse Source
This commit is contained in:
Vasily Levchenko
2019-11-21 06:53:49 +01:00
committed by Vasily Levchenko
parent f056b3cd0a
commit be6722d44a
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
performance/build.gradle
+7 -5
View File
@@ -16,19 +16,19 @@ def rootBuildDirectory = rootProject.projectDir
task konanRun { task konanRun {
subprojects.each { subprojects.each {
dependsOn it.getTasksByName('konanRun', true)[0] dependsOn "${it.path}:konanRun"
} }
} }
task jvmRun { task jvmRun {
subprojects.each { subprojects.each {
dependsOn it.getTasksByName('jvmRun', true)[0] dependsOn "${it.path}:jvmRun"
} }
} }
task clean { task clean {
subprojects.each { subprojects.each {
dependsOn it.getTasksByName('clean', true)[0] dependsOn "${it.path}:clean"
} }
doLast { doLast {
delete "${buildDir.absolutePath}" delete "${buildDir.absolutePath}"
@@ -187,8 +187,10 @@ task mergeJvmReports {
} }
subprojects.each { subprojects.each {
it.getTasksByName('jvmJsonReport', true)[0].finalizedBy mergeJvmReports it.afterEvaluate {
it.getTasksByName('konanJsonReport', true)[0].finalizedBy mergeNativeReports it.jvmJsonReport.finalizedBy mergeJvmReports
it.konanJsonReport.finalizedBy mergeNativeReports
}
} }
task teamCityStat(type:Exec) { task teamCityStat(type:Exec) {
settings.gradle
+15 -13
View File
@@ -31,19 +31,21 @@ include ':backend.native:tests'
include ':backend.native:debugger-tests' include ':backend.native:debugger-tests'
include ':utilities' include ':utilities'
include ':performance' if (hasProperty("konan.home") || hasProperty("org.jetbrains.kotlin.native.home")) {
include ':performance:ring' include ':performance'
include ':performance:cinterop' include ':performance:ring'
include ':performance:helloworld' include ':performance:cinterop'
include ':performance:numerical' include ':performance:helloworld'
include ':performance:videoplayer' include ':performance:numerical'
include ':performance:framework' include ':performance:videoplayer'
if (System.getProperty("os.name") == "Mac OS X") { include ':performance:framework'
include ':performance:objcinterop' if (System.getProperty("os.name") == "Mac OS X") {
include ':performance:swiftinterop' include ':performance:objcinterop'
if (hasProperty("runExcludedBenchmarks")) { include ':performance:swiftinterop'
include ':performance:KotlinVsSwift' if (hasProperty("runExcludedBenchmarks")) {
include ':performance:KotlinVsSwift:ring' include ':performance:KotlinVsSwift'
include ':performance:KotlinVsSwift:ring'
}
} }
} }