Changeset 17302

Timestamp:

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

Author:

oranfry

Message:

added a priority hint option to search4j

Location:

release-kits/shared/search4j

Files:

• libsearch4j.cpp (modified) (2 diffs)
• libsearch4j.h (modified) (1 diff)
• search4j.cpp (modified) (4 diffs)

release-kits/shared/search4j/libsearch4j.cpp

@@ -293 +293 @@
 * return a Jvm object which represents the jvm on disk
 */
-bool find( Jvm &jvm, bool use_minimum, Jvm minimum, string hint, bool verbose ) {
+bool find( Jvm &jvm, bool use_minimum, Jvm minimum, string phint, string hint, bool verbose ) {
     
     if ( verbose ) cout << "Searching for a JVM" << endl;
@@ -300 +300 @@
     bool jvmFound = false;
     
+    if ( !jvmFound ) {
+        
+        //try the priority hint
+        if ( verbose ) cout << " - trying priority hint: ";
+        if ( strcmp(phint.c_str(),"") != 0  ) {
+            if ( verbose ) cout << "(" << phint << ") ";
+            jvm.setJavaHome( phint );
+            if ( jvm.check() ) {
+                if ( use_minimum ) {
+                    if ( jvm.compare( minimum ) >= 0 ) {
+                        jvmFound = true;
+                    }
+                } else {
+                    jvmFound = true;
+                }
+            }
+        }
+        if ( verbose ) { if( jvmFound ) cout << "yes" << endl; else cout << "no" << endl; }
+    }
+
     if ( !jvmFound ) {
         

release-kits/shared/search4j/libsearch4j.h

@@ -53 +53 @@
 
 
-bool find( Jvm &jvm, bool use_minimum, Jvm minimum, string hint, bool verbose );
+bool find( Jvm &jvm, bool use_minimum, Jvm minimum, string phint, string hint, bool verbose );

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