Changeset 18237 for other-projects/trunk/search4j/search4j.cpp

Timestamp:

2008-12-17T17:38:47+13:00 (15 years ago)

Author:

oranfry

Message:

added new options to search4j to only return a jre or only return a jre, and an option to display the type of the found jvm (whether jre or jdk)

File:

• other-projects/trunk/search4j/search4j.cpp (modified) (15 diffs)

other-projects/trunk/search4j/search4j.cpp

@@ -18 +18 @@
     JavaHome,
     Version,
-    Executable
+    Executable,
+    Type
 };
 
@@ -38 +39 @@
     else if ( jp == Executable )
         return "Executable";
+    else if ( jp == Type )
+        return "Type";
+
     return "Unknown";
 }
@@ -49 +53 @@
     bool use_minimum = false;
     bool useJavaw = false;
-    Jvm minimum; 
+    bool jdkOnly = false;
+    bool jreOnly = false;
+    Jvm minimum;
     JvmProperty jvmProperty = JavaHome;
     Action action = Find;
@@ -56 +62 @@
     //parse commandline arguments
     for (int i=1; i<argc; i++) {
+
+        //be verbose
         if ( strcmp(argv[i], "--verbose") == 0 ) {
             verbose = true;
+
+        //show help
         } else if ( strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "--usage") == 0 ) {
             usage();
             return 0;
+
+        //show version
         } else if ( strcmp(argv[i], "-v") == 0 ) {
             jvmProperty = Version;
+
+        //show path to executable
         } else if ( strcmp(argv[i], "-e") == 0 ) {
             jvmProperty = Executable;
+
+        //show whether jre or jdk
+        } else if ( strcmp(argv[i], "-t") == 0 ) {
+            jvmProperty = Type;
+
+        //compare found java with the given version string
         } else if ( strcmp(argv[i], "-c") == 0 ) {
             action = Compare;
@@ -74 +94 @@
             }
 
+        //find only javas at or above the given version
         } else if ( strcmp(argv[i], "-m") == 0 ) {
             if ( i == argc-1 ) {
@@ -86 +107 @@
             }
 
+        //find only jdks
+        } else if ( strcmp(argv[i], "-d") == 0 ) {
+            jdkOnly = true;
+
+        //find only jres
+        } else if ( strcmp(argv[i], "-r") == 0 ) {
+            jreOnly = true;
+
+        //launch the named jar with the found java
         } else if ( strcmp(argv[i], "-l") == 0 ) {
             if ( i == argc-1 ) {
@@ -95 +125 @@
             }
 
+        //take the given priority hint
         } else if ( strcmp(argv[i], "-p") == 0 ) {
             if ( i == argc-1 ) {
@@ -103 +134 @@
             }
 
+        // take the following hint
         } else if ( strcmp(argv[i], "-h") == 0 ) {
             if ( i == argc-1 ) {
@@ -110 +142 @@
                 hint = argv[++i];
             }
-            
+
         #ifdef WINDOWS
+        //show the path to the javaw executable
         } else if ( strcmp(argv[i], "-w") == 0 ) {
             useJavaw = true;
@@ -129 +162 @@
     //find java
     Jvm foundJvm;
-    bool found = find( foundJvm, use_minimum, minimum, phint, hint, verbose );
+    bool found = find( foundJvm, use_minimum, minimum, jreOnly, jdkOnly, phint, hint, verbose );
 
     //check if it was found
@@ -145 +178 @@
     if ( action == Find ) {
 
-        if ( verbose ) cout << "Property to print: " << jvmPropertyToString( jvmProperty ) << endl;     
+        if ( verbose ) cout << "Property to print: " << jvmPropertyToString( jvmProperty ) << endl;
 
         //found - print out info about it
@@ -162 +195 @@
             cout << foundJvm.getExecutable() << endl;
             #endif
+        } else if ( jvmProperty == Type ) {
+            if ( foundJvm.getIsJdk() ) {
+        cout << "JDK" << endl;
+            } else {
+          cout << "JRE" << endl;
+            }
         } else {
             return -1; //should never happen
@@ -221 +260 @@
         << "find:     find java and print out information about it" << endl
         << endl
-        << "          search4j [-v|-e]" << endl
+        << "          search4j [-v|-e|-t]" << endl
         << "          eg: search4j -e" << endl
         << endl
@@ -227 +266 @@
         << "          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 -t is specified, print whether the found java is a JRE or a JDK" << endl
         << endl
         << "compare:  compare the found java with the given java version string" << endl
@@ -246 +286 @@
         << "Global Options:" << endl
         << "          -m VERSION_STRING: (minimum) find a java of the given version or newer, or fail" << endl
+        << "          -d : find only jdks" << endl
+        << "          -r : find only jres" << 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