Changeset 15205 for release-kits/lirk3/wrapper/mywrapper.c

Timestamp:

2008-04-23T17:26:48+12:00 (16 years ago)

Author:

oranfry

Message:

some updates to make the release kit produce nicer installers

File:

• release-kits/lirk3/wrapper/mywrapper.c (modified) (3 diffs)

release-kits/lirk3/wrapper/mywrapper.c

@@ -66 +66 @@
             cout << "Your java is too old." << endl;
         } else {
-            cout << "Could not find java." << endl;
+            cout << "Could not find java on your system." << endl;
         }
         
@@ -73 +73 @@
         #ifdef java_is_bundled
             //yes, JRE is bundled
+            /*
             cout
                 << "This installer comes bundled with a suitible version of java: " << endl
@@ -79 +80 @@
             char r[1024]; cin >> r;
             if ( strcmp( r, "y" ) == 0 || strcmp( r, "Y" ) == 0) {
-                extract_bundled_file( java, sizeof(java), (char*)"@java.installer@", true );
-                system( "./@java.installer@" );
-                jvmFound = true; //assume the java installation went well
-            }
+            */
+
+            cout << "Using bundled java." << endl;
+            extract_bundled_file( java, sizeof(java), (char*)"@java.installer@", true );
+            system( "tar -xzf @java.installer@" );
+            jvmFound = true; //assume the java installation went well
+
+            /*}*/
         #endif