Changeset 17302 for release-kits/shared/search4j/search4j.cpp

Timestamp:

2008-09-17T11:59:00+12:00 (16 years ago)

Author:

oranfry

Message:

added a priority hint option to search4j

File:

• release-kits/shared/search4j/search4j.cpp (modified) (4 diffs)

release-kits/shared/search4j/search4j.cpp

@@ -45 +45 @@
 
     bool verbose = false;
+    string phint = "";
     string hint = "";
     bool use_minimum = false;
@@ -94 +95 @@
             }
 
+        } else if ( strcmp(argv[i], "-p") == 0 ) {
+            if ( i == argc-1 ) {
+                usage();
+                return -1;
+            } else {
+                phint = argv[++i];
+            }
+
         } else if ( strcmp(argv[i], "-h") == 0 ) {
             if ( i == argc-1 ) {
@@ -120 +129 @@
     //find java
     Jvm foundJvm;
-    bool found = find( foundJvm, use_minimum, minimum, hint, verbose );
+    bool found = find( foundJvm, use_minimum, minimum, phint, hint, verbose );
 
     //check if it was found
@@ -237 +246 @@
         << "Global Options:" << endl
         << "          -m VERSION_STRING: (minimum) find a java of the given version or newer, or fail" << endl
+        << "          -p LOCATION: (priority hint) first look for java in LOCATION (treated as a JAVA_HOME)" << endl
         << "          -h LOCATION: (hint) as a last resort look for java in LOCATION (treated as a JAVA_HOME)" << endl
         << "          -w: (windows) find and/or use the javaw.exe executable instead of java.exe (in windows only)" << endl