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

Timestamp:

2008-03-26T15:30:33+13:00 (16 years ago)

Author:

oranfry

Message:

added a hint option to search4j

File:

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

release-kits/shared/search4j/search4j.cpp

@@ -31 +31 @@
 bool verbose = false;
 bool use_minimum = false;
+string hint = "";
 
 enum JvmProperty {
@@ -257 +258 @@
         << "find:     find java and print out information about it" << endl
         << endl
-        << "          search4j [-v|-e] [-m VERSION_STRING]" << endl
-        << "          eg: search4j -m 1.4.1_01 -e" << endl
+        << "          search4j [-v|-e]" << endl
+        << "          eg: search4j -e" << endl
         << endl
         << "          by default, print JAVA_HOME. E.g., C:\\Program Files\\jre1.5.0_15, or" << endl
         << "          if -v is specified, print the java version string. E.g. 1.5.0_15, or" << endl
         << "          if -e is specified, print the path the to the java executable. E.g. C:\\Program Files\\jre1.5.0_15\\bin\\java.exe" << endl
-        << "          if -m option is used, find a java of the given version or newer, or fail" << endl
         << endl
         << "compare:  compare the found java with the given java version string" << endl
@@ -280 +280 @@
         << endl
         << "          specify the location of the jar relative to the current directory" << endl
-        << "          if -m option is used, find a java of the given version or newer" << endl
         << endl
         << "Global Options:" << endl
+        << "          -m VERSION_STRING: (minimum) find a java of the given version or newer, or fail" << endl
+        << "          -h LOCATION: (hint) as a last resort look for java in LOCATION (treated as a JAVA_HOME)" << endl
         << "          --verbose : have search4j print out information about what its doing" << endl
         << "          --help : display this usage screen" << endl
@@ -330 +331 @@
         javaHome = getenv( "JAVA_HOME" );
         if ( javaHome != NULL ) {
-            if ( verbose ) cout << "(" << javaHome << ")";
+            if ( verbose ) cout << "(" << javaHome << ") ";
             jvm.setJavaHome( javaHome );
             if ( jvm.check() ) {
@@ -350 +351 @@
         javaHome = getenv( "JRE_HOME" );
         if ( javaHome != NULL ) {
-            if ( verbose ) cout << "(" << javaHome << ")";
+            if ( verbose ) cout << "(" << javaHome << ") ";
             jvm.setJavaHome( javaHome );
             if ( jvm.check() ) {
@@ -423 +424 @@
     #endif
 
+    if ( !jvmFound ) {
+        //try the hint
+        if ( verbose ) cout << " - trying hint: ";
+        if ( strcmp(hint.c_str(),"") != 0  ) {
+            if ( verbose ) cout << "(" << hint << ") ";
+            jvm.setJavaHome( hint );
+            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; }
+    }
+
+
     return jvmFound;
 }
@@ -453 +474 @@
             if ( i == argc-1 ) {
                 usage();
-                return 0;
+                return -1;
             } else {
                 arg1 = argv[++i];
             }
 
-            } else if ( strcmp(argv[i], "-m") == 0 ) {
+        } else if ( strcmp(argv[i], "-m") == 0 ) {
             if ( i == argc-1 ) {
                 usage();
-                return 0;
+                return -1;
             } else {
                 if ( !minimum.setVersionFromString( argv[++i] ) ) {
@@ -471 +492 @@
 
         } else if ( strcmp(argv[i], "-l") == 0 ) {
-            action = Launch;
-            arg1 = argv[++i];
+            if ( i == argc-1 ) {
+                usage();
+                return -1;
+            } else {
+                action = Launch;
+                arg1 = argv[++i];
+            }
+
+        } else if ( strcmp(argv[i], "-h") == 0 ) {
+            if ( i == argc-1 ) {
+                usage();
+                return -1;
+            } else {
+                hint = argv[++i];
+            }
 
         } else {