From 5b9cd53cc199b78c53014b20d5403ab7ec4e8f87 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Mon, 12 Dec 2011 13:09:26 +0400 Subject: [PATCH] IDEA-78430 Gradle: Fix gradle-based run configurations Gradle run configuration is adapted to the changes made for the generic groovy run configurations --- .../plugins/gradle/config/GradleScriptType.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java index 26b00c9f6332..2b419614cdf6 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java @@ -93,7 +93,7 @@ public class GradleScriptType extends GroovyScriptType { public void tuneConfiguration(@NotNull GroovyFile file, @NotNull GroovyScriptRunConfiguration configuration, Location location) { String target = getTaskTarget(location); if (target != null) { - configuration.setProgramParameters(target); + configuration.setScriptParameters(target); configuration.setName(configuration.getName() + "." + target); } @@ -174,7 +174,9 @@ public class GradleScriptType extends GroovyScriptType { public void configureCommandLine(JavaParameters params, @Nullable Module module, boolean tests, - VirtualFile script, GroovyScriptRunConfiguration configuration) throws CantRunException { + VirtualFile script, GroovyScriptRunConfiguration configuration) + throws CantRunException + { final Project project = configuration.getProject(); final GradleLibraryManager libraryManager = ServiceManager.getService(GradleLibraryManager.class); final VirtualFile gradleHome = libraryManager.getGradleHome(module, project); @@ -208,10 +210,15 @@ public class GradleScriptType extends GroovyScriptType { params.getVMParametersList().add("-Dgradle.home=" + FileUtil.toSystemDependentName(gradleHome.getPath())); setToolsJar(params); - + + final String scriptPath = configuration.getScriptPath(); + if (scriptPath == null) { + throw new CantRunException("Target script is undefined"); + } params.getProgramParametersList().add("--build-file"); - params.getProgramParametersList().add(FileUtil.toSystemDependentName(configuration.getScriptPath())); + params.getProgramParametersList().add(FileUtil.toSystemDependentName(scriptPath)); params.getProgramParametersList().addParametersString(configuration.getProgramParameters()); + params.getProgramParametersList().addParametersString(configuration.getScriptParameters()); } }; }