diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index d173af166f7..04eafa7c03a 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -435,7 +435,7 @@ abstract class AbstractIncrementalJpsTest( } override fun buildStarted(context: CompileContext, chunk: ModuleChunk) { - if (context.projectDescriptor.project.modules.size > 1) { + if (!chunk.isDummy(context) && context.projectDescriptor.project.modules.size > 1) { logLine("Building ${chunk.modules.sortedBy { it.name }.joinToString { it.name }}") } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index d8eafe29cfa..b41645a9e69 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -121,6 +121,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) { super.chunkBuildStarted(context, chunk) + if (chunk.isDummy(context)) return + context.testingContext?.buildLogger?.buildStarted(context, chunk) if (JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)) return @@ -178,9 +180,11 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) } - override fun chunkBuildFinished(context: CompileContext?, chunk: ModuleChunk?) { + override fun chunkBuildFinished(context: CompileContext, chunk: ModuleChunk) { super.chunkBuildFinished(context, chunk) + if (chunk.isDummy(context)) return + LOG.debug("------------------------------------------") } @@ -190,6 +194,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { dirtyFilesHolder: DirtyFilesHolder, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { + if (chunk.isDummy(context)) return NOTHING_DONE + val messageCollector = MessageCollectorAdapter(context) val fsOperations = FSOperationsHelper(context, chunk, LOG) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/jpsUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/jpsUtil.kt new file mode 100644 index 00000000000..3f50e40d2df --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/jpsUtil.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.jps.build + +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.incremental.CompileContext + +fun ModuleChunk.isDummy(context: CompileContext): Boolean { + val targetIndex = context.projectDescriptor.buildTargetIndex + return targets.all { targetIndex.isDummy(it) } +} \ No newline at end of file