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

Timestamp:

2008-03-28T12:53:30+13:00 (16 years ago)

Author:

oranfry

Message:

a few changes to wirk3 to keep it up-to-date with lirk3

File:

• release-kits/wirk3/wrapper/wrapper.cpp (modified) (3 diffs)

release-kits/wirk3/wrapper/wrapper.cpp

@@ -77 +77 @@
     extractResource( "GREENSTONE_JAR", "JAR", (char*) jarLocation.c_str() );
     
-    //change to the temp directory and start the jar
+    //change to the temp directory
     SetCurrentDirectory( tempdir.c_str() );
 
@@ -107 +107 @@
             if ( _stricmp( r, "y" ) == 0 ) {
                 system( "@java.installer@" );
+                jvmFound = true; //assume the java installation went well
             }
-            jvmFound = true; //assume the java installation went well
         } else {
             //no, JRE is not bundled
@@ -124 +124 @@
         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
+        //report how it went
         if ( launch_exit_code == 0 ) {
             cout << "Setup complete" << endl;