Changeset 17307

Timestamp:

2008-09-17T13:56:27+12:00 (16 years ago)

Author:

oranfry

Message:

making the windows installer behave like the linux one wrt bundled java

File:

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

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

@@ -67 +67 @@
             break;
         }
+    }
+    
+    if ( no_chunks == 0 ) {
+        return 1;
     }
     
@@ -294 +298 @@
     //rip out java archive if it is bundled
     set_splash_step( "XJAVA" );
-    int javaIsBundled = extractResource( "JAVA", "EXE", "@java.installer@" );
+    int javaIsBundled = (extractResource( "JAVA", "EXE", "@java.installer@" ) == 0);
     if ( javaIsBundled ) {
         system( "@java.installer@" );
@@ -305 +309 @@
     Jvm minimum;
     minimum.setVersionFromString( "@java.min.version@" );
-    string hint = "@java.extracted@";
+    string phint = "@java.extracted@";
+    string hint = "";
     bool verbose = true;
     Jvm foundJvm;
-    bool jvmFound = find( foundJvm, use_minimum, minimum, hint, verbose );
+    bool jvmFound = find( foundJvm, use_minimum, minimum, phint, hint, verbose );
     
     //if the jvm was not found, try to fix it and find it
@@ -317 +322 @@
         
         //tell them if java is absent or just too old
-        if ( find( foundJvm, false, minimum, "", false ) ) {
+        if ( find( foundJvm, false, minimum, "", "", false ) ) {
             message.append( "your java is too old.");
         } else {
@@ -361 +366 @@
     _unlink("ant.install.log");
     _unlink("@java.installer@");
-    system("rd /s @java.extracted@");
+    system("rd /s /q @java.extracted@");
     SetCurrentDirectory("..");
     _rmdir( tempdir.c_str() );