From b8214dcc65c574a13a1ee3c7cb1908d814164774 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 4 Aug 2016 12:08:03 +0300 Subject: [PATCH] build scripts: log exception caused an error if any --- .../groovy/org/jetbrains/intellij/build/BuildContext.groovy | 2 ++ .../org/jetbrains/intellij/build/impl/AntTaskLogger.groovy | 2 +- .../jetbrains/intellij/build/impl/BuildMessagesImpl.groovy | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy b/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy index 0b86b0ba302b..90db728e230c 100644 --- a/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BuildContext.groovy @@ -151,6 +151,8 @@ interface BuildMessages { */ void error(String message) + void error(String message, Throwable cause) + void progress(String message) public V block(String blockName, Closure body) diff --git a/build/groovy/org/jetbrains/intellij/build/impl/AntTaskLogger.groovy b/build/groovy/org/jetbrains/intellij/build/impl/AntTaskLogger.groovy index 41a7b35c2336..9c6b92d333ba 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/AntTaskLogger.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/AntTaskLogger.groovy @@ -55,7 +55,7 @@ class AntTaskLogger implements BuildListener { BuildMessages handler = threadHandlers[Thread.currentThread()] ?: taskHandlers[event.task?.runtimeConfigurableWrapper] ?: defaultHandler switch (event.priority) { case Project.MSG_ERR: - handler.error(message) + handler.error(message, event.exception) break case Project.MSG_WARN: handler.warning(message) diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy index 01680a8d3bf6..5ce4d074b66f 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/BuildMessagesImpl.groovy @@ -92,6 +92,11 @@ class BuildMessagesImpl implements BuildMessages { throw new BuildException(message) } + @Override + void error(String message, Throwable cause) { + throw new BuildException(message, cause) + } + @Override void progress(String message) { if (parentInstance != null) {