Changeset 15892

Timestamp:

2008-06-06T11:13:01+12:00 (16 years ago)

Author:

oranfry

Message:

change to search4j: using libraries and headers the proper way

Location:

release-kits/shared/search4j

Files:

• compile.sh (modified) (1 diff)
• libsearch4j.cpp (modified) (11 diffs)
• libsearch4j.h (deleted)
• search4j (modified) ( previous)
• search4j.cpp (modified) (4 diffs)

release-kits/shared/search4j/compile.sh

@@ -1 @@
-g++ search4j.cpp -o search4j
+g++ -c libsearch4j.cpp
+g++ -c search4j.cpp
+g++ search4j.o libsearch4j.o -o search4j
+

release-kits/shared/search4j/libsearch4j.cpp

@@ -3 +3 @@
 */
 
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <sstream>
-using namespace std;
+#include "libsearch4j.h"
+
 
 #ifdef WINDOWS
+
 #include <windows.h>
 //minimal launch4j stuff
@@ -19 +17 @@
 #define pclose _pclose
 #define strcmp _stricmp
+#define ID_TIMER 1
+
 #endif /* WINDOWS */
 
@@ -32 +32 @@
 }
 
-int process( string command, string &output ) {
+
+int process( string command, bool render ) {
+
+    #ifdef WINDOWS
+
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    memset(&pi, 0, sizeof(pi));
+    memset(&si, 0, sizeof(si));
+    si.cb = sizeof(si);
+
+    DWORD dwExitCode = -1;
+    char* cmd = (char*)command.c_str();
+
+    bool result;
+    if ( render ) {
+        result = CreateProcess(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi);
+    } else {
+        result = CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+    }
+
+    if ( result ) {
+        WaitForSingleObject(pi.hProcess, INFINITE);
+        GetExitCodeProcess(pi.hProcess, &dwExitCode);
+        CloseHandle(pi.hThread);
+        CloseHandle(pi.hProcess);
+    }
+    return dwExitCode;
+
+    #else
+
+    return system( command.c_str() );
+
+    #endif
+}
+
+
+
+int process_and_catch_output( string command, string &output ) {
+    
+    #ifdef WINDOWS
+
+    char cmd[1024] = "cmd.exe /c ";
+    strcat(cmd, command.c_str());
+    strcat(cmd, " > cmd_output.txt 2>&1");
+    //cerr << "command: " << cmd << endl;
+    int code = process( cmd, false );
+    if ( code!= 0 )
+        return code;
+    
+    string line;
+    ifstream myfile("cmd_output.txt");
+    if ( !myfile.is_open() ) {
+        return -1;
+    }
+
+    while ( !myfile.eof() ) {
+        getline(myfile,line);
+        output.append( line );
+    }
+
+    myfile.close();
+    
+    _unlink( "cmd_output.txt" );
+    
+    return code;
+
+    #else
     
     FILE *pPipe;
 
-    /* Run command so that it writes its output to a pipe. Open this
-    * pipe with read text attribute so that we can read it 
-    * like a text file. */
-    char cmd[1024]; strcpy(cmd, command.c_str());
-    
-    #ifdef WINDOWS
-    if( (pPipe = popen( cmd, "rt" )) == NULL ) {
-        //if ( verbose ) cout << "could not start process" << endl;
-        pclose( pPipe );
-        return -1;
-    }
-    #endif
-
-    #ifndef WINDOWS
+    char cmd[1024];
+    strcpy(cmd, command.c_str());
+    strcat(cmd, " 2>&1" );
+
+    //if ( verbose ) cout << "process(): running '" << command << "'" << endl;
     if( (pPipe = popen( cmd, "r" )) == NULL ) {
         //if ( verbose ) cout << "could not start process" << endl;
@@ -55 +113 @@
         return -1;
     }
-    #endif
+
+    //if ( verbose ) cout << "started process" << endl;
 
     /* Read pipe until end of file. */
@@ -74 +133 @@
     /* Close pipe and return return value of pPipe. */
     int code = pclose( pPipe );
+
     return code;
-}
-
-class Jvm {
-
-    string javaHome;
-    
-    // version string. era.major.minor_update. eg: 1.4.2_02
-    int era;
-    int major;
-    int minor;
-    int update;
-
-    bool isJdk;
-    bool healthy;   
-
-
-    public:
-    Jvm() {
+
+    #endif
+
+}
+
+//Jvm class methods
+
+Jvm::Jvm() {
+    healthy = false;
+}
+
+void Jvm::setJavaHome( string jh ) {
+    healthy = true;
+    javaHome = jh;
+    setVersionFromExeOuput();
+}
+
+string Jvm::getJavaHome() {
+    return javaHome;
+}
+
+string Jvm::getExecutable() {
+    string exec = "";
+    exec.append( javaHome );
+    
+    #ifdef WINDOWS
+    exec.append( "\\bin\\java.exe" );
+    #endif
+
+    #ifndef WINDOWS
+    exec.append( "/bin/java" );
+    #endif
+    
+    return exec;
+}
+
+#ifdef WINDOWS
+string Jvm::getWinExecutable() {
+    string exec = "";
+    exec.append( javaHome );
+    exec.append( "\\bin\\javaw.exe" );
+    return exec;
+}
+#endif
+
+
+string Jvm::getVersion() {
+    stringstream ss;
+    ss << era << "." << major << "." << minor << "_" << update;
+    return ss.str();
+}
+
+bool Jvm::check() {
+    return healthy;
+}
+
+bool Jvm::setVersionFromString( string version ) {
+    era = atoi( version.substr(0,1).c_str() );
+    major = atoi( version.substr(2,1).c_str() );
+    minor = atoi( version.substr(4,1).c_str() );
+    update = atoi( version.substr(6,2).c_str() );
+    return true;
+}
+
+int Jvm::compare( Jvm otherJvm ) {
+    //era
+    if ( era > otherJvm.getEra() )
+        return 1;
+    else if ( era < otherJvm.getEra() )
+        return -1;
+    
+    //major
+    if ( major > otherJvm.getMajor() )
+        return 1;
+    else if ( major < otherJvm.getMajor() )
+        return -1;
+        
+    //minor
+    if ( minor > otherJvm.getMinor() )
+        return 1;
+    else if ( minor < otherJvm.getMinor() )
+        return -1;
+
+    //update
+    if ( update > otherJvm.getUpdate() )
+        return 1;
+    else if ( update < otherJvm.getUpdate() )
+        return -1;
+
+    //all the same so far, must be exactly the same
+    return 0;
+
+}
+
+int Jvm::getEra() { return era; }
+int Jvm::getMajor() { return major; }
+int Jvm::getMinor() { return minor; }
+int Jvm::getUpdate() { return update; }
+
+void Jvm::setVersionFromExeOuput() {
+    string command = "", output = "";
+    command.append( "\"" );
+    command.append( getExecutable() );
+    command.append( "\"" );
+    command.append(" -version");
+
+    //cerr << "command: " << command << endl;
+    int result = process_and_catch_output( command, output );
+    //cerr << "output: " << output << endl;
+    
+    if ( result == 0 ) {
+        if ( strcmp( output.substr( 0, 12 ).c_str() , "java version" ) == 0 || true ) {
+            era = atoi( output.substr(14,1).c_str() );
+            major = atoi( output.substr(16,1).c_str() );
+            minor = atoi( output.substr(18,1).c_str() );
+            update = atoi( output.substr(20,2).c_str() );
+        } else {
+            healthy=false;
+        }
+    } else {
         healthy = false;
     }
-
-    void setJavaHome( string jh ) {
-        healthy = true;
-        javaHome = jh;
-        setVersionFromExeOuput();
-    }
-
-    string getJavaHome() {
-        return javaHome;
-    }
-
-    string getExecutable() {
-        string exec = "";
-        exec.append( javaHome );
-        
-        #ifdef WINDOWS
-        exec.append( "\\bin\\java.exe" );
-        #endif
-
-        #ifndef WINDOWS
-        exec.append( "/bin/java" );
-        #endif
-        
-        return exec;
-    }
-
-    #ifdef WINDOWS
-    string getWinExecutable() {
-        string exec = "";
-        exec.append( javaHome );
-        exec.append( "\\bin\\javaw.exe" );
-        return exec;
-    }
-    #endif
-
-    
-    string getVersion() {
-        stringstream ss;
-        ss << era << "." << major << "." << minor << "_" << update;
-        return ss.str();
-    }
-    
-    bool check() {
-        return healthy;
-    }
-
-    bool setVersionFromString( string version ) {
-        era = atoi( version.substr(0,1).c_str() );
-        major = atoi( version.substr(2,1).c_str() );
-        minor = atoi( version.substr(4,1).c_str() );
-        update = atoi( version.substr(6,2).c_str() );
-        return true;
-    }
-    
-    int compare( Jvm otherJvm ) {
-        //era
-        if ( era > otherJvm.getEra() )
-            return 1;
-        else if ( era < otherJvm.getEra() )
-            return -1;
-        
-        //major
-        if ( major > otherJvm.getMajor() )
-            return 1;
-        else if ( major < otherJvm.getMajor() )
-            return -1;
-            
-        //minor
-        if ( minor > otherJvm.getMinor() )
-            return 1;
-        else if ( minor < otherJvm.getMinor() )
-            return -1;
-
-        //update
-        if ( update > otherJvm.getUpdate() )
-            return 1;
-        else if ( update < otherJvm.getUpdate() )
-            return -1;
-
-        //all the same so far, must be exactly the same
-        return 0;
-
-    }
-    
-    int getEra() { return era; }
-    int getMajor() { return major; }
-    int getMinor() { return minor; }
-    int getUpdate() { return update; }
-    
-    private:
-    
-    void setVersionFromExeOuput() {
-        string command = "", output = "";
-        command.append( "\"" );
-        command.append( getExecutable() );
-        command.append( "\"" );
-        command.append(" -version 2>&1");
-        
-        int result = process( command, output );
-        
-        if ( result == 0 ) {
-            if ( strcmp( output.substr( 0, 12 ).c_str() , "java version" ) == 0 || true ) {
-                era = atoi( output.substr(14,1).c_str() );
-                major = atoi( output.substr(16,1).c_str() );
-                minor = atoi( output.substr(18,1).c_str() );
-                update = atoi( output.substr(20,2).c_str() );
-            } else {
-                healthy=false;
-            }
-        } else {
-            healthy = false;
-        }
-    }
-    
-    
-};
+}
+    
+//end of Jvm class methods
+
 
 #ifdef WINDOWS
@@ -248 +298 @@
     
     if ( verbose ) cout << "Searching for a JVM" << endl;
+    
     char *javaHome = "";
     bool jvmFound = false;
     
     if ( !jvmFound ) {
+        
         //try JAVA_HOME
         if ( verbose ) cout << " - trying JAVA_HOME: ";
@@ -272 +324 @@
     
     if ( !jvmFound ) {
+        
         //try JRE_HOME
         if ( verbose ) cout << " - trying JRE_HOME: ";
@@ -293 +346 @@
     #ifdef WINDOWS
     if ( !jvmFound ) {
+
         //try the registry - this code based on launch4j code
-        char foundJavaVer[128] = {0};
+        char foundJavaVer[8192] = {0};
         int foundJava = NO_JAVA_FOUND;
         
-        if ( verbose ) cout << " - trying the registry: ";
+        if ( verbose ) cout << " - trying the registry: "; cout.flush();
         HKEY hKey;
         const char jre[] = "SOFTWARE\\JavaSoft\\Java Runtime Environment";
@@ -322 +376 @@
                 strcpy(keyBuffer, sdk);
             }
+            
             strcat(keyBuffer, "\\");
             strcat(keyBuffer, foundJavaVer);
+            
             if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT(keyBuffer), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) {
                 unsigned char buffer[1024] = {0};
@@ -334 +390 @@
                         strcat(path, "\\jre");
                     }
+                    if ( verbose ) cerr << "path: " << path << endl ;
                     jvm.setJavaHome( path );
                     if ( jvm.check() ) {
@@ -353 +410 @@
 
     if ( !jvmFound ) {
+        
         //try the hint
         if ( verbose ) cout << " - trying hint: ";

release-kits/shared/search4j/search4j.cpp

@@ -144 +144 @@
             cout << foundJvm.getVersion() << endl;
         } else if ( jvmProperty == Executable ) {
+            #ifdef WINDOWS
             if ( useJavaw ) {
                 cout << foundJvm.getWinExecutable() << endl;
@@ -149 +150 @@
                 cout << foundJvm.getExecutable() << endl;
             }
+            #else
+            cout << foundJvm.getExecutable() << endl;
+            #endif
         } else {
             return -1; //should never happen
@@ -179 +183 @@
         
         string cmd = "\"", output = "";
+        #ifdef WINDOWS
         if ( useJavaw ) {
             cmd.append( foundJvm.getWinExecutable() );
@@ -184 +189 @@
             cmd.append( foundJvm.getExecutable() );
         }
+        #else
+        cmd.append( foundJvm.getExecutable() );
+        #endif
         cmd.append( "\" -jar " );
         cmd.append( arg1 );