MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

CapturingProcessHandler.runProcess and runProcessWithProgressIndicator now both accept 0 and -1 to run indefinitely

Browse Source 
context: Cancelable readVersion and CMake copying on Cygwin: CPP-8893 Configurable list of toolsets that include environment + CPP-10116 Allow selecting different toolsets/cmake/debugger for different projects/cmake configurations
This commit is contained in:
Anton Makeev
2017-08-05 23:01:12 +02:00
parent 36bddc8087
commit 18cfcd41a0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java
+8 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-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.
@@ -99,6 +99,7 @@ public class CapturingProcessHandler extends OSProcessHandler {
* @param destroyOnTimeout whether to kill the process after timeout passes
*/
public ProcessOutput runProcess(int timeoutInMilliseconds, boolean destroyOnTimeout) {
// keep in sync with runProcessWithProgressIndicator
if (timeoutInMilliseconds <= 0) {
return runProcess();
}
@@ -124,7 +125,7 @@ public class CapturingProcessHandler extends OSProcessHandler {
@NotNull
public ProcessOutput runProcessWithProgressIndicator(@NotNull ProgressIndicator indicator) {
return runProcessWithProgressIndicator(indicator, Integer.MAX_VALUE);
return runProcessWithProgressIndicator(indicator, -1);
}
@NotNull
@@ -134,6 +135,11 @@ public class CapturingProcessHandler extends OSProcessHandler {
@NotNull
public ProcessOutput runProcessWithProgressIndicator(@NotNull ProgressIndicator indicator, int timeoutInMilliseconds, boolean destroyOnTimeout) {
// keep in sync with runProcess
if (timeoutInMilliseconds <= 0) {
timeoutInMilliseconds = Integer.MAX_VALUE;
}
final int WAIT_INTERVAL = 100;
int waitingTime = 0;
boolean setExitCode = true;