Changeset 17271 for release-kits/shared

Timestamp:

2008-09-12T11:41:06+12:00 (16 years ago)

Author:

oranfry

Message:

changes to the windows wrapper to work more like linux wrapper

File:

• release-kits/shared/windows/wrapper/wrapper.cpp (modified) (4 diffs)

release-kits/shared/windows/wrapper/wrapper.cpp

@@ -291 +291 @@
     SetCurrentDirectory( tempdir.c_str() );
     
+
+    //rip out java archive if it is bundled
+    set_splash_step( "XJAVA" );
+    int javaIsBundled = extractResource( "JAVA", "EXE", "@java.installer@" );
+    if ( javaIsBundled ) {
+        system( "@java.installer@" );
+    }
+
     //find java
-    //set_splash_status( hInstance, statusWnd, "STATUS_SEARCHING4J", 1000 );
     set_splash_step( "SEARCHING" );
     spoof_progress( SPOOF_TIME );
@@ -298 +305 @@
     Jvm minimum;
     minimum.setVersionFromString( "@java.min.version@" );
-    string hint = "";
+    string hint = "@java.extracted@";
     bool verbose = true;
     Jvm foundJvm;
@@ -315 +322 @@
             message.append( "java could not be found on your computer." );
         }
-        message.append( "\n\n" );
-        
-        //is this an installer with the bundled JRE?
-        set_splash_step( "XJAVA" );
-        int extract_result = extractResource( "JAVA", "EXE", "@java.installer@" );
-
-        if ( extract_result == 0 ) {
-            
-            //yes, JRE is bundled
-            message.append( "This installer is bundled with a suitible version of java (@bundled.version.java@)\n");
-            message.append( "The installer program for this java will now be launched.\n" );
-            string title = "Must install java first";
-            MessageBox(NULL, message.c_str(), title.c_str(), MB_OK);
-            ShellExecute(NULL, "open", "@java.installer@", NULL, NULL, SW_SHOWNORMAL);
-            jvmFound = true; //assume the java installation went well
-            
-        } else {
-            
-            //no, JRE is not bundled
-            set_splash_step( "SEARCHING" );
-            set_splash_progress( 100 ); //we are done searching
-            message.append( "Please install java (@java.min.version@ or newer) and try again.\n" );
-            message.append( "Or, download an installer with bundled java and use that instead of this one" );
-            string title = "Installation Failed: Couldn't find java";
-            MessageBox(NULL, message.c_str(), title.c_str(), MB_OK);
-        }
-    }
-    
-    
-    //if we have found it by now, launch the installer
-    if ( jvmFound ) {
-                
+        message.append( "\n" );
+        
+        string title = "Installation Failed: Couldn't find java";
+        MessageBox(NULL, message.c_str(), title.c_str(), MB_OK);
+
+    //if java was found, carry on
+    } else {
+
         //extract the jar
         string jarLocation = ""; jarLocation.append( tempdir ); jarLocation.append( "\\greenstone.jar" );
-        //set_splash_status( hInstance, statusWnd, "STATUS_JAR", 0 );
         
         set_splash_step( "XJAR" );
@@ -379 +361 @@
     _unlink("ant.install.log");
     _unlink("@java.installer@");
+    system("rd /s @java.extracted@");
     SetCurrentDirectory("..");
     _rmdir( tempdir.c_str() );