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

update pty4j library to v0.7.5

Browse Source 
https://github.com/traff/pty4j/pull/43
This commit is contained in:
Sergey Simonchik
2018-05-29 14:15:54 +03:00
parent 3fc24c1193
commit 9616dd7d43
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/pty4j.xml
Generated
+2 -2
View File
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="pty4j">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/pty4j-0.7.4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/pty4j-0.7.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/pty4j-0.7.4-src.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/src/pty4j-0.7.5-src.jar!/" />
</SOURCES>
</library>
</component>
lib/pty4j-0.7.4.jar → lib/pty4j-0.7.5.jar
BIN
View File
Binary file not shown.
lib/src/pty4j-0.7.4-src.jar → lib/src/pty4j-0.7.5-src.jar
BIN
View File
Binary file not shown.
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+1 -1
View File
@@ -326,7 +326,7 @@ class CommunityLibraryLicenses {
licenseUrl: "https://github.com/google/protobuf/blob/master/LICENSE"),
new LibraryLicense(name: "Proxy Vole", libraryName: "proxy-vole", version: "1.0.4", license: "Apache 2.0",
url: "https://github.com/MarkusBernhardt/proxy-vole", licenseUrl: "https://github.com/MarkusBernhardt/proxy-vole/blob/master/LICENSE.md"),
new LibraryLicense(name: "pty4j", libraryName: "pty4j", version: "0.7.4", license: "Eclipse Public License v1.0",
new LibraryLicense(name: "pty4j", libraryName: "pty4j", version: "0.7.5", license: "Eclipse Public License v1.0",
url: "https://github.com/traff/pty4j"),
new LibraryLicense(name: "PureJavaComm", libraryName: "purejavacomm", version: "0.0.16", license: "BSD",
url: "http://www.sparetimelabs.com/purejavacomm"),
platform/platform-api/src/com/intellij/execution/configurations/PtyCommandLine.java
+10 -7
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.util.ArrayUtil;
import com.pty4j.PtyProcess;
import com.pty4j.PtyProcessBuilder;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -98,14 +98,17 @@ public class PtyCommandLine extends GeneralCommandLine {
Map<String, String> env = new HashMap<>();
setupEnvironment(env);
if (isRedirectErrorStream()) {
LOG.error("Launching process with PTY and redirected error stream is unsupported yet");
}
String[] command = ArrayUtil.toStringArray(commands);
File workDirectory = getWorkDirectory();
String directory = workDirectory != null ? workDirectory.getPath() : null;
boolean cygwin = myUseCygwinLaunch && SystemInfo.isWindows;
return PtyProcess.exec(command, env, directory, console, cygwin, getPtyLogFile());
PtyProcessBuilder builder = new PtyProcessBuilder(command)
.setEnvironment(env)
.setDirectory(directory)
.setConsole(console)
.setCygwin(cygwin)
.setLogFile(getPtyLogFile())
.setRedirectErrorStream(isRedirectErrorStream());
return builder.start();
}
}
}