Changeset 15095 for release-kits/wirk3/wrapper/wrapper.cpp

Timestamp:

2008-03-20T10:48:10+13:00 (16 years ago)

Author:

oranfry

Message:

checking in a few weeks work on wirk3

Location:

release-kits/wirk3

Files:

• . (modified) (1 prop)
• wrapper/wrapper.cpp (modified) (2 diffs)

release-kits/wirk3

@@ -1 +1 @@
 lib http://svn.greenstone.org/release-kits/shared/lib
+search4j http://svn.greenstone.org/release-kits/shared/search4j
 
+

@@ -1 +1 @@
 lib http://svn.greenstone.org/release-kits/shared/lib
+search4j http://svn.greenstone.org/release-kits/shared/search4j
 
+

release-kits/wirk3/wrapper/wrapper.cpp

@@ -3 +3 @@
 #include <fstream>
 #include <iostream>
+#include <conio.h>
+#include <string>
+#include <time.h>
 
 using namespace std;
@@ -37 +40 @@
 }
 
-void main()
-{
-    
+void cleanup( string dir, string file ) {
+    string command = "if EXIST ";
+    command.append( dir );
+    command.append( "\\" );
+    command.append( file );
+    command.append( " del " );
+    command.append( dir );
+    command.append( "\\" );
+    command.append( file );
+    system( command.c_str() );
+}
+
+void main() {
+    string command;
+    srand( time(0) );
+
     cout << "Greenstone3 Installer" << endl;
         
     //create the temp folder
-    cout << "Creating temp folder 'greenstone3.tmp' ..." << endl;
-    system("mkdir greenstone3.tmp");
+    char id[6]; for( int i=0; i<5; i++ ) id[i] = (char)((rand()%26) + 97); id[5] = '\0'; //id for this instance
+    string tempdir = "greenstone3.tmp"; tempdir.append( id ); //the temp dir
+
+    cout << "Creating temp folder '";
+    cout << tempdir;
+    cout << "' ..." << endl;    
+    command = "mkdir "; command.append(tempdir);
+    system( command.c_str() );
     
     //extract the resources
-    cout << "Extracting jar launcher ..." << endl;
-    extractResource( "LAUNCHER", "EXE", "greenstone3.tmp\\launch-installer.exe" );
+    cout << "Extracting search4j tool ..." << endl;
+    string search4jLocation = ""; search4jLocation.append( tempdir ); search4jLocation.append( "\\search4j.exe" );
+    extractResource( "SEARCH4J", "EXE", (char*) search4jLocation.c_str() );
     
     cout << "Extracting jar installer ..." << endl;
-    extractResource( "GREENSTONE_JAR", "JAR", "greenstone3.tmp\\greenstone3.jar" );
-                
+    string jarLocation = ""; jarLocation.append( tempdir ); jarLocation.append( "\\greenstone3.jar" );
+    extractResource( "GREENSTONE_JAR", "JAR", (char*) jarLocation.c_str() );
+    
     //change to the temp directory and start the jar
-    SetCurrentDirectory("greenstone3.tmp");
+    SetCurrentDirectory( tempdir.c_str() );
 
-    //launch the jar with launch4j, taking a note of the exit code or info in the log
-    cout << "Launching Installer ..." << endl;
-    int launch_exit_code = 0;
-    launch_exit_code = system("launch-installer.exe");
-            
-    //if it failed, launch the installer for the bundled java, then try again
-    if ( launch_exit_code == 1 ) {
-        cout << "Greenstone requires Java Runtime Enviromnent (JRE) 1.4.0 or greater" << endl;
-        cout << "It appears that you do not have an a suitible JRE installed" << endl;
-
+    //check if an appropriate java is found
+    bool jvmFound = (system( "search4j.exe -m @java.min.version@" ) == 0);
+    
+    //if the jvm was not found, try to fix it and find it
+    if ( !jvmFound ) {
+        //did not find a good java
+        cout << "Greenstone requires java @java.min.version@ or greater" << endl;
+        
+        //tell them if java is absent or just too old
+        if ( system( "search4j.exe" ) == 0 ) {
+            cout << "Your java is too old." << endl;
+        } else {
+            cout << "Could not find java." << endl;
+        }
         
         //is this an installer with the bundled JRE?
-        cout << "Extracting java installer ..." << endl;
+        cout << "Checking for bundled java ..." << endl;
         int extract_result = extractResource( "JAVA", "EXE", "@java.installer@" );
         if ( extract_result == 0 ) {
-            
             //yes, JRE is bundled
-            cout << "Starting the installation process for the bundled JRE" << endl;    
-            system( "@java.installer@" );
-            launch_exit_code = system("launch-installer.exe");
-            if ( launch_exit_code == 1 ) {
-                cout << "Still could not find a JRE. Please install a JRE and try again." << endl;
+            cout
+                << "This installer comes bundled with a suitible version of java: " << endl
+                << "   @java.installer@" << endl
+                << "Do you want to install this java? (y/n)" << endl;
+            char r[1024]; cin >> r;
+            if ( _stricmp( r, "y" ) == 0 ) {
+                system( "@java.installer@" );
             }
-            
+            jvmFound = true; //assume the java installation went well
         } else {
-            
             //no, JRE is not bundled
-            cout << "Sorry, there is no bundled JRE" << endl;
-            cout << "Install a JRE and try again (make sure JRE_HOME is set)" << endl;
-            cout << "Or, download a greentsone3 installer with a bundled JRE and use that instead of this one" << endl;
+            cout << "Sorry, there is no bundled java with this installer" << endl;
+            cout << "Install java (@java.min.version@ or newer) and try again" << endl;
+            cout << "Or, download a greentsone3 installer with bundled java and use that instead of this one" << endl;
+        }
+    }
+    
+    //if we have found it by now, launch the installer
+    if ( jvmFound ) {
+        //launch the jar with search4j, taking a note of the exit code
+        cout << "Launching Installer ..." << endl;
+        int launch_exit_code = 0;
+        launch_exit_code = system("search4j.exe -m @java.min.version@ -l greenstone3.jar");
         
+        //if it failed, launch the installer for the bundled java, then try again
+        if ( launch_exit_code == 0 ) {
+            cout << "Setup complete" << endl;
+        } else {
+            cout << "Still could not find a suitible version of java" << endl;
+            cout << "Please install java and try again" << endl;
         }
-        system("if EXISTS greenstone3.tmp\\@java.installer@ del greenstone3.tmp\\@java.installer@");
-        
     }
     
     //change back to the original directory and clean up the temp directory
     SetCurrentDirectory("..");
-    system("if EXISTS greenstone3.tmp\\greenstone3.jar del greenstone3.tmp\\greenstone3.jar");
-    system("if EXISTS greenstone3.tmp\\launch-installer.exe del greenstone3.tmp\\launch-installer.exe");
-    system("if EXISTS greenstone3.tmp\\ant.install.log del greenstone3.tmp\\ant.install.log");
-    system("rmdir greenstone3.tmp");
+
+    cleanup(tempdir, "greenstone3.jar" );
+    cleanup(tempdir, "search4j.exe");
+    cleanup(tempdir, "ant.install.log");
+    cleanup(tempdir, "@java.installer@");
     
+    command = "rmdir ";
+    command.append( tempdir );
+    system( command.c_str() );
+    cout << "Press any key to exit..." << endl;
+    getch();
     
 }

@@ -1 +1 @@
 lib http://svn.greenstone.org/release-kits/shared/lib
+search4j http://svn.greenstone.org/release-kits/shared/search4j
 
+