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

WI-8147 Canceling a phing build does not stop the build

Browse Source
This commit is contained in:
Shaverdova Elena
2011-11-21 16:32:11 +04:00
parent f86a457c46
commit 66154d5063
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/execution/process/ScriptRunnerUtil.java
+8 -12
View File
@@ -20,7 +20,6 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Conditions;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.encoding.EncodingManager;
@@ -28,6 +27,8 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Map;
/**
* @author Elena Shaverdova
* @author Nikolay Matveev
@@ -43,15 +44,6 @@ public final class ScriptRunnerUtil {
}
};
public static final Condition<Key> STDERR_OUTPUT_KEY_FILTER = new Condition<Key>() {
@Override
public boolean value(Key key) {
return ProcessOutputTypes.STDERR.equals(key);
}
};
public static final Condition<Key> STDOUT_OR_STDERR_OUTPUT_KEY_FILTER = Conditions.or(STDOUT_OUTPUT_KEY_FILTER, STDERR_OUTPUT_KEY_FILTER);
private static final int DEFAULT_TIMEOUT = 30000;
private ScriptRunnerUtil() {
@@ -101,10 +93,14 @@ public final class ScriptRunnerUtil {
public static OSProcessHandler execute(@NotNull String exePath,
@Nullable String workingDirectory,
@Nullable VirtualFile scriptFile,
String[] parameters) throws ExecutionException {
String[] parameters,
@Nullable Map<String, String> environmentParams) throws ExecutionException {
GeneralCommandLine commandLine = new GeneralCommandLine();
commandLine.setExePath(exePath);
commandLine.setPassParentEnvs(true);
if (environmentParams != null) {
commandLine.setEnvParams(environmentParams);
}
if (scriptFile != null) {
commandLine.addParameter(scriptFile.getPresentableUrl());
}
@@ -139,7 +135,7 @@ public final class ScriptRunnerUtil {
ScriptOutputType scriptOutputType,
@NonNls String... parameters)
throws ExecutionException {
final OSProcessHandler processHandler = execute(exePathString, workingDirectory, scriptFile, parameters);
final OSProcessHandler processHandler = execute(exePathString, workingDirectory, scriptFile, parameters, null);
final StringBuilder standardOutput = scriptOutputType.readStandardOutput() ? new StringBuilder() : null;
final StringBuilder errorOutput = scriptOutputType.readErrorOutput() ? new StringBuilder() : null;