close #137 Gradle - specify what JAVA_HOME to use

Nodeclipse · Apr 1, 2014 · 270a992 · paulvi · Apr 3, 2014 · 270a992
1 parent 14d180f
commit 270a992
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/org.nodeclipse.enide.gradle/README.md b/org.nodeclipse.enide.gradle/README.md
@@ -7,6 +7,8 @@
 
 ## org.nodeclipse.enide.gradle
 
+![](docs/from-getting-started.PNG)
+
 `build.gradle` Run As Gradle GUI
 
 - Minisite <http://www.nodeclipse.org/enide/gradle/>

diff --git a/org.nodeclipse.enide.gradle/docs/from-getting-started.PNG b/org.nodeclipse.enide.gradle/docs/from-getting-started.PNG
diff --git a/...ipse.enide.gradle/src/org/nodeclipse/enide/gradle/launch/LaunchConfigurationDelegate.java b/...ipse.enide.gradle/src/org/nodeclipse/enide/gradle/launch/LaunchConfigurationDelegate.java
@@ -153,7 +153,13 @@ protected String[] getEnvironmentVariables(ILaunchConfiguration configuration) t
 			String value = envm.get(key);
 			envp[idx++] = key + "=" + value;
 		}
-		envp[idx++] = "JAVA_HOME=" + System.getProperty("java.home"); //System.getenv("JAVA_HOME");
+		// #137
+		String javaHomeToUse = preferenceStore.getString(GradleConstants.GRADLE_JAVA_HOME_TO_USE);//@since 0.15
+		if(!javaHomeToUse.equals("")) {
+			envp[idx++] = "JAVA_HOME=" + javaHomeToUse;
+		}else{
+			envp[idx++] = "JAVA_HOME=" + System.getProperty("java.home"); //System.getenv("JAVA_HOME");
+		}
 		//FAILURE: Build failed with an exception.
 		//
 		//* What went wrong:

diff --git a/org.nodeclipse.enide.gradle/src/org/nodeclipse/enide/gradle/preferences/GradleConstants.java b/org.nodeclipse.enide.gradle/src/org/nodeclipse/enide/gradle/preferences/GradleConstants.java
@@ -23,6 +23,7 @@ public class GradleConstants {
 
 	public static final String GRADLE_HOME = "gradle_home";
 	public static final String GRADLE_HOME_TO_USE = "gradle_home_to_use";
+	public static final String GRADLE_JAVA_HOME_TO_USE = "java_home_to_use";
 	public static final String GRADLE_OPTS = "gradle_opts";
 	public static final String GRADLE_PATH = "gradle_path";	
 	public static final String GRADLE_OPTIONS = "gradle_options";	

diff --git a/...clipse.enide.gradle/src/org/nodeclipse/enide/gradle/preferences/GradlePreferencePage.java b/...clipse.enide.gradle/src/org/nodeclipse/enide/gradle/preferences/GradlePreferencePage.java
@@ -20,6 +20,7 @@ public class GradlePreferencePage extends FieldEditorPreferencePage implements I
 
 	private DirectoryFieldEditor gradleHome;
 	private DirectoryFieldEditor gradleHomeToUse;
+	private DirectoryFieldEditor javaHomeToUse;
 	private StringFieldEditor gradleJvmOpts;
 
     private StringFieldEditor gradleOptions;
@@ -79,6 +80,8 @@ protected void createFieldEditors() {
 		//TODO show version in this Preference Page
 		gradleHomeToUse = new DirectoryFieldEditor(GradleConstants.GRADLE_HOME_TO_USE, "Gradle home to use:", getFieldEditorParent());
 		addField(gradleHomeToUse);
+		javaHomeToUse = new DirectoryFieldEditor(GradleConstants.GRADLE_HOME_TO_USE, "alternative JAVA_HOME to use:", getFieldEditorParent());
+		addField(javaHomeToUse);
 		gradleJvmOpts = new StringFieldEditor(GradleConstants.GRADLE_OPTS, "JVM options GRADLE_OPTS:", getFieldEditorParent());
 		addField(gradleJvmOpts);