Changeset 35698 for main/trunk

Timestamp:

2021-10-24T23:44:10+13:00 (2 years ago)

Author:

davidb

Message:

search4j extended to try to find 'java/javac' on PATH after all other ways have failed. Tested on Linux with g++. At this point not clear if dirname() (which is POSIX compliant) is available in VisualStudio.

Location:

main/trunk/search4j

Files:

• libsearch4j.cpp (modified) (5 diffs)
• libsearch4j.h (modified) (1 diff)

main/trunk/search4j/libsearch4j.cpp

@@ -4 +4 @@
 
 #include "libsearch4j.h"
-
 
 #ifdef WINDOWS
@@ -68 +67 @@
 
 
-int process_and_catch_output( string command, string &output ) {
+int process_and_catch_output( string command, string& output ) {
     
     FILE *pPipe;
@@ -90 +89 @@
     /* Read pipe until end of file. */
     while( !feof( pPipe ) ) {
-        char psBuffer[128];
+        char psBuffer[512];
         //if ( verbose ) cout << "get some data" << endl;
-        if( fgets( psBuffer, 128, pPipe ) != NULL ) {
+        if( fgets( psBuffer, sizeof(psBuffer), pPipe ) != NULL ) {
             
             //if ( verbose ) cout << "got: " << psBuffer << endl;
@@ -239 +238 @@
 }
 
-int Jvm::getEra() { return era_; }
-int Jvm::getMajor() { return major_; }
-int Jvm::getMinor() { return minor_; }
-int Jvm::getUpdate() { return update_; }
-
-bool Jvm::getIsJdk() { return isJdk_; }
-bool Jvm::getIsJre() { return !isJdk_; }
+int  Jvm::getEra()    { return era_; }
+int  Jvm::getMajor()  { return major_; }
+int  Jvm::getMinor()  { return minor_; }
+int  Jvm::getUpdate() { return update_; }
+
+bool Jvm::getIsJdk()  { return isJdk_; }
+bool Jvm::getIsJre()  { return !isJdk_; }
 
 void Jvm::setVersionFromExeOuput() {
@@ -519 +518 @@
 
 
+
+    if ( !jvmFound ) {      
+        //look for it on PATH 
+        if ( verbose ) cout << " - Looking on PATH (possibly yielding a pseudo, but passable, JAVA_HOME such as /usr): ";
+
+#ifdef WINDOWS
+        // The following is the DOS equivalent to 'which java', however note that
+        // 'where' returns a list of all possible matches (one per line)
+        const char* cmd = "where java 2>nul";
+#else
+        const char* cmd = "which java 2>/dev/null"; 
+#endif
+        char full_path_java[512] = { '\0' }; // empty string
+
+        // ****
+        // Consider replacing the following code with a call to process_and_catch_output(command, output)
+        // but would need extending to have extra (optional) argument 'only_first_list' which defaults to 'false'
+        
+        FILE* PIN = popen(cmd,"r");
+        if (PIN == NULL) {
+          cerr << "Failed to run the command to locate 'java' on PATH" << endl;
+          cerr << "Command run was: " << cmd << endl;
+        }
+        else {
+          // Only need the first line of output
+
+          // Returns number of chars returned.  OK to ignore here
+          if (fgets(full_path_java, sizeof(full_path_java), PIN) == NULL) {
+            // Not strictly necessary (as already initialized to be the empty string when declared)
+            // but done to void the warning g++ gives about not checking the return value
+            full_path_java[0] = '\0';
+          }
+        }
+        
+        // Not all implmentations of 'which' are coded to return 0 if a program match is found
+        // => safer just to look to see if a non-empty string is returned
+
+        int ignore_exit_val = pclose(PIN);
+        
+        if ( strcmp(full_path_java,"") != 0) {
+          // go two directories up from where 'java' was found
+          javaHomeEnv = dirname(dirname(full_path_java));
+
+          // Logic from here same as for other search4j java/javac testing
+          if ( verbose ) cout << "(" << javaHomeEnv << ") ";
+          jvm.setJavaHome( javaHomeEnv );
+          if ( jvm.check() ) {
+            if ( use_minimum ) {
+              if ( jvm.compare( minimum ) >= 0 ) {
+            jvmFound = true;
+              }
+            } else {
+              jvmFound = true;
+            }
+          }
+          if ( (jreOnly && !jvm.getIsJre() ) || (jdkOnly && !jvm.getIsJdk()) ) {
+            jvmFound = false;
+          }
+          
+        }
+        if ( verbose ) { if( jvmFound ) cout << "yes" << endl; else cout << "no" << endl; }
+    }
+
+    
     return jvmFound;
 }

main/trunk/search4j/libsearch4j.h

@@ -6 +6 @@
 #include <sstream>
 #include <sys/stat.h>
+
+#include <libgen.h>
+
 using namespace std;
 #ifdef WINDOWS