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

Gradle: vmOptions provisioning fix

Browse Source
This commit is contained in:
Vladislav.Soroka
2013-09-18 13:08:59 +04:00
parent e39cc019e8
commit a49963f10e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
+5 -3
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.Function;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt;
import org.gradle.StartParameter;
import org.gradle.tooling.*;
@@ -82,10 +83,11 @@ public class GradleExecutionHelper {
public BuildLauncher getBuildLauncher(@NotNull final ExternalSystemTaskId id,
@NotNull ProjectConnection connection,
@Nullable GradleExecutionSettings settings,
@NotNull ExternalSystemTaskNotificationListener listener)
@NotNull ExternalSystemTaskNotificationListener listener,
@Nullable final String vmOptions)
{
BuildLauncher result = connection.newBuild();
prepare(result, id, settings, listener, Collections.<String>emptyList());
prepare(result, id, settings, listener, ContainerUtil.newArrayList(vmOptions == null ? "" : vmOptions.trim()));
return result;
}
@@ -191,7 +193,7 @@ public class GradleExecutionHelper {
}
ProjectConnection connection = getConnection(projectPath, settings);
try {
BuildLauncher launcher = getBuildLauncher(id, connection, settings, listener);
BuildLauncher launcher = getBuildLauncher(id, connection, settings, listener, null);
try {
final File tempFile = FileUtil.createTempFile("wrap", ".gradle");
tempFile.deleteOnExit();
plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
+3 -6
View File
@@ -53,14 +53,14 @@ public class GradleTaskManager implements ExternalSystemTaskManager<GradleExecut
@Nullable final String debuggerSetup,
@NotNull final ExternalSystemTaskNotificationListener listener) throws ExternalSystemException {
//if(settings != null && settings.getDistributionType() == DistributionType.WRAPPED) {
if(settings != null) {
myHelper.ensureInstalledWrapper(id, projectPath, settings, listener);
//}
}
Function<ProjectConnection, Void> f = new Function<ProjectConnection, Void>() {
@Override
public Void fun(ProjectConnection connection) {
BuildLauncher launcher = myHelper.getBuildLauncher(id, connection, settings, listener);
BuildLauncher launcher = myHelper.getBuildLauncher(id, connection, settings, listener, vmOptions);
if (!StringUtil.isEmpty(debuggerSetup)) {
try {
final File tempFile = FileUtil.createTempFile("init", ".gradle");
@@ -78,9 +78,6 @@ public class GradleTaskManager implements ExternalSystemTaskManager<GradleExecut
throw new ExternalSystemException(e);
}
}
if (!StringUtil.isEmpty(vmOptions)) {
launcher.setJvmArguments(vmOptions.trim());
}
launcher.forTasks(ArrayUtil.toStringArray(taskNames));
launcher.run();
return null;