Changeset 16207

Timestamp:

2008-06-26T14:40:53+12:00 (15 years ago)

Author:

oranfry

Message:

made the linux wrapper use libsearch4j instead of a bundled search4j executable

File:

• release-kits/shared/linux/wrapper.cpp (modified) (6 diffs)

release-kits/shared/linux/wrapper.cpp

@@ -6 +6 @@
 
 #include "wrapper.h"
+#include "libsearch4j.h"
 
 bool extract_bundled_file( const char[], int, char*, bool );
@@ -13 +14 @@
     string tempdir = "greenstone.tmp"; //temporary directory where we will store extracted files
     string jarfile = tempdir + "/@[email protected]"; //where we will store the jar file
-    string search4jfile = tempdir + "/search4j"; //where we will store the jar file
     string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
     bool succeeded = false;
@@ -30 +30 @@
     cout << "Extracting installer jar..." << endl;
     succeeded = extract_bundled_file( @installer.name@jar, sizeof(@installer.name@jar), (char*)jarfile.c_str(), false);
-
-    cout << "Extracting search4j tool..." << endl;
-    succeeded = extract_bundled_file( search4j, sizeof(search4j), (char*)search4jfile.c_str(), true ) && succeeded;
 
     #ifdef java_is_bundled
@@ -61 +58 @@
 
     //check if an appropriate java is found
-    bool jvmFound = (system( "./search4j -m @java.min.version@ -h ./@java.extracted@" ) == 0);
+    Jvm minimum; minimum.setVersionFromString( "@java.min.version@" );
+    string hint = "./@java.extracted@";
+    Jvm foundJvm;
+    bool jvmFound = find( foundJvm, true, minimum, hint, false );
 
     //if the jvm was not found, report not found
@@ -70 +70 @@
         
         //tell them if java is absent or just too old
-        if ( system( "./search4j -h ./@java.extracted@" ) == 0 ) {
+        Jvm tmpJvm;
+        if ( find(tmpJvm,false,minimum,hint,false) ) {
             cout << "You have java, but it is too old." << endl;
         } else {
             cout << "Could not find java on your system." << endl;
         }
+        tmpJvm = NULL;
 
         cout << "Install java (@java.min.version@ or greater) and set JAVA_HOME or JRE_HOME, and try again" << endl;
@@ -86 +88 @@
         cout << "Launching Installer ..." << endl;
         int launch_exit_code = 0;
-        launch_exit_code = system("./search4j -m @java.min.version@ -l @[email protected] -h ./@java.extracted@");
+        launch_exit_code = system( foundJvm.getExecutable() + " -jar @[email protected]" );
 
         //report how it went