eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-05-03 17:35:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 1470: now auto-detects JAVA_HOME and auto-inserts JAVA_HOME/bin into path.

Browse Source
This commit is contained in:
jdf
2010-03-04 19:03:47 +00:00
parent 5bed47f10d
commit 871bfcc9b9
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/tool/src/processing/app/tools/android/AndroidSDK.java
View File

@@ -27,9 +27,24 @@ class AndroidSDK {
androidTool = findAndroidTool(tools);
final Platform p = Base.getPlatform();
String path = p.getenv("PATH");
p.setenv("ANDROID_SDK", sdk.getCanonicalPath());
p.setenv("PATH", tools.getCanonicalPath() + File.pathSeparator
+ p.getenv("PATH"));
path = tools.getCanonicalPath() + File.pathSeparator + path;
final String javaHomeProp = System.getProperty("java.home");
if (javaHomeProp == null) {
throw new RuntimeException(
"I don't know how to deal with a null java.home proprty, to be quite frank.");
}
final File javaHome = new File(javaHomeProp).getCanonicalFile();
p.setenv("JAVA_HOME", javaHome.getCanonicalPath());
path = new File(javaHome, "bin").getCanonicalPath() + File.pathSeparator
+ path;
p.setenv("PATH", path);
}
public File getAndroidTool() {