From de831441140862fcec7e35d660776474bb45c0a1 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 15 Aug 2016 15:14:09 +0300 Subject: [PATCH] build scripts: generate unique names for parallel tasks --- .../jetbrains/intellij/build/impl/BuildMessagesImpl.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy index fa69eb43f771..5a2d0544d958 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy @@ -15,6 +15,7 @@ */ package org.jetbrains.intellij.build.impl +import com.intellij.util.text.UniqueNameGenerator import groovy.transform.CompileStatic import org.apache.tools.ant.BuildException import org.apache.tools.ant.DefaultLogger @@ -40,6 +41,7 @@ class BuildMessagesImpl implements BuildMessages { private final BuildMessagesImpl parentInstance private final List forkedInstances = [] private final List delayedMessages = [] + private final UniqueNameGenerator taskNameGenerator = new UniqueNameGenerator() static BuildMessagesImpl create(JpsGantProjectBuilder builder, Project antProject) { String key = "IntelliJBuildMessages" @@ -137,7 +139,8 @@ class BuildMessagesImpl implements BuildMessages { } @Override - BuildMessages forkForParallelTask(String taskName) { + BuildMessages forkForParallelTask(String suggestedTaskName) { + String taskName = taskNameGenerator.generateUniqueName(suggestedTaskName) def forked = new BuildMessagesImpl(loggerFactory.apply(taskName), loggerFactory, antTaskLogger, this) forkedInstances << forked return forked