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

gwt compiler for external build: don't use CommandLineWrapper for GWT compiler

Browse Source
This commit is contained in:
nik
2012-11-01 14:38:20 +04:00
parent e86d7b8435
commit 2576260fc6
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
+27 -19
View File
@@ -8,6 +8,7 @@ import org.jetbrains.jps.cmdline.ClasspathBootstrap;
import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -35,7 +36,7 @@ public class ExternalProcessUtil {
List<String> bootClasspath,
List<String> classpath,
List<String> vmParams,
List<String> programParams) {
List<String> programParams, final boolean useCommandLineWrapper) {
final List<String> cmdLine = new ArrayList<String>();
cmdLine.add(javaExecutable);
@@ -50,33 +51,40 @@ public class ExternalProcessUtil {
}
if (!classpath.isEmpty()) {
File classpathFile = null;
final Class wrapperClass = getCommandLineWrapperClass();
if (wrapperClass != null) {
try {
classpathFile = FileUtil.createTempFile("classpath", null);
final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(classpathFile)));
List<String> commandLineWrapperArgs = null;
if (useCommandLineWrapper) {
final Class wrapperClass = getCommandLineWrapperClass();
if (wrapperClass != null) {
try {
for (String path : classpath) {
writer.println(path);
File classpathFile = FileUtil.createTempFile("classpath", null);
final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(classpathFile)));
try {
for (String path : classpath) {
writer.println(path);
}
}
finally {
writer.close();
}
commandLineWrapperArgs = Arrays.asList(
"-classpath",
ClasspathBootstrap.getResourcePath(wrapperClass).getPath(),
wrapperClass.getName(),
classpathFile.getAbsolutePath()
);
}
finally {
writer.close();
catch (IOException ex) {
LOG.info("Error starting " + mainClass + "; Classpath wrapper will not be used: ", ex);
}
}
catch (IOException ex) {
LOG.info("Error starting " + mainClass + "; Classpath wrapper will not be used: ", ex);
else {
LOG.info("CommandLineWrapper class not found, classpath wrapper will not be used");
}
}
// classpath
if (classpathFile != null) {
cmdLine.add("-classpath");
final File wrapperClasspath = ClasspathBootstrap.getResourcePath(wrapperClass);
cmdLine.add(wrapperClasspath.getPath());
cmdLine.add(wrapperClass.getName());
cmdLine.add(classpathFile.getAbsolutePath());
if (commandLineWrapperArgs != null) {
cmdLine.addAll(commandLineWrapperArgs);
}
else {
cmdLine.add("-classpath");
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java
+1 -1
View File
@@ -371,7 +371,7 @@ public class AndroidDexBuilder extends TargetBuilder<BuildRootDescriptor,Android
final List<String> commandLine = ExternalProcessUtil
.buildJavaCommandLine(JpsJavaSdkType.getJavaExecutable((JpsSdk<?>)javaSdk.getProperties()), AndroidDxRunner.class.getName(),
Collections.<String>emptyList(), classPath, vmOptions, programParamList);
Collections.<String>emptyList(), classPath, vmOptions, programParamList, true);
LOG.info(AndroidCommonUtils.command2string(commandLine));
plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class GroovyBuilder extends ModuleLevelBuilder {
"-Dfile.encoding=" + System.getProperty("file.encoding")/*,
"-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5239"*/),
Arrays.<String>asList(myForStubs ? "stubs" : "groovyc",
tempFile.getPath())
tempFile.getPath()), true
);
final Process process = Runtime.getRuntime().exec(ArrayUtil.toStringArray(cmd));