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

[Gradle, JS] Add more info for check exit code

Browse Source
This commit is contained in:
Ilya Goncharov
2019-11-21 12:31:21 +03:00
parent ac241852de
commit 64380670c5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/exec.kt
+8 -3
View File
@@ -13,7 +13,6 @@ import org.gradle.process.internal.ExecActionFactory
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.PipedInputStream import java.io.PipedInputStream
import java.io.PipedOutputStream import java.io.PipedOutputStream
import java.nio.CharBuffer
import kotlin.concurrent.thread import kotlin.concurrent.thread
internal fun Project.execWithProgress(description: String, readStdErr: Boolean = false, body: (ExecAction) -> Unit): ExecResult { internal fun Project.execWithProgress(description: String, readStdErr: Boolean = false, body: (ExecAction) -> Unit): ExecResult {
@@ -32,7 +31,7 @@ internal fun Project.execWithProgress(description: String, readStdErr: Boolean =
val buffer = StringBuilder() val buffer = StringBuilder()
while (true) { while (true) {
val read = reader.read() val read = reader.read()
if (read == -1) break; if (read == -1) break
val ch = read.toChar() val ch = read.toChar()
if (ch == '\b' || ch == '\n' || ch == '\r') { if (ch == '\b' || ch == '\n' || ch == '\r') {
if (buffer.isNotEmpty()) { if (buffer.isNotEmpty()) {
@@ -55,7 +54,13 @@ internal fun Project.execWithProgress(description: String, readStdErr: Boolean =
val result = exec.execute() val result = exec.execute()
outputReaderThread.join() outputReaderThread.join()
if (result.exitValue != 0) { if (result.exitValue != 0) {
error(stderr.toString() + "\n" + stdout) error(
"""
Process '$description' returns ${result.exitValue}
$stderr
$stdout
""".trimIndent()
)
} }
result result
} }