aboutsummaryrefslogtreecommitdiffstats
path: root/find_java/src/source/find_java.h
diff options
context:
space:
mode:
authorDavid Herman <davidherman@google.com>2014-10-20 10:36:53 -0700
committerDavid Herman <davidherman@google.com>2014-10-23 11:56:57 -0700
commitea29cd16b2ae3f04294165ba0b5e4d839dfc8406 (patch)
tree7cf0692184661ce8629282a2828062d4345777b3 /find_java/src/source/find_java.h
parent171072b90ed953304b1bbfa96022ab71b82d9969 (diff)
downloadsdk-ea29cd16b2ae3f04294165ba0b5e4d839dfc8406.zip
sdk-ea29cd16b2ae3f04294165ba0b5e4d839dfc8406.tar.gz
sdk-ea29cd16b2ae3f04294165ba0b5e4d839dfc8406.tar.bz2
New -path arg for find_java
Previously, the only way to specify a custom java.exe location for find_java was through JAVA_HOME, but now we have one more hook. If you pass in a custom path, and it is found, the rest of find_java will be skipped, and that path will be used. This has a few advantages: 1) Passing in an explicit custom path is really intuitive. 2) JAVA_HOME may be used by other applications, and asking users to override it for us could cause compatibility issues. 3) This makes life much easier for our installer, which does not want to blindly overwrite the user's JAVA_HOME environment variable. 4) If we ever change where we store a java path (new registry, in a file somewhere), we don't have to recompile find_java.exe to account for it. All we have to do is update find_java.bat. 5) This gives us a really easy way to tell users who run into find_java bugs a way to fix them. Change-Id: I1d7bd95c9225f34c22d987005f32af256f81d908
Diffstat (limited to 'find_java/src/source/find_java.h')
-rwxr-xr-xfind_java/src/source/find_java.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/find_java/src/source/find_java.h b/find_java/src/source/find_java.h
index fe7da4d..49b5fd9 100755
--- a/find_java/src/source/find_java.h
+++ b/find_java/src/source/find_java.h
@@ -30,7 +30,8 @@
#define MIN_JAVA_VERSION_MINOR 6
#define MIN_JAVA_VERSION TO_JAVA_VERSION(MIN_JAVA_VERSION_MAJOR, MIN_JAVA_VERSION_MINOR)
-int checkJavaInPath(const CPath &path, bool isJdk = false, int minVersion = MIN_JAVA_VERSION);
+int findJavaInPath(const CPath &path, CPath *outJavaPath, bool isJdk = false,
+ int minVersion = MIN_JAVA_VERSION);
int findJavaInEnvPath(CPath *outJavaPath, bool isJdk = false,
int minVersion = MIN_JAVA_VERSION);
int findJavaInRegistry(CPath *outJavaPath, bool isJdk = false,