Changeset 17307
- Timestamp:
- 2008-09-17T13:56:27+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/shared/windows/wrapper/wrapper.cpp
r17271 r17307 67 67 break; 68 68 } 69 } 70 71 if ( no_chunks == 0 ) { 72 return 1; 69 73 } 70 74 … … 294 298 //rip out java archive if it is bundled 295 299 set_splash_step( "XJAVA" ); 296 int javaIsBundled = extractResource( "JAVA", "EXE", "@java.installer@");300 int javaIsBundled = (extractResource( "JAVA", "EXE", "@java.installer@" ) == 0); 297 301 if ( javaIsBundled ) { 298 302 system( "@java.installer@" ); … … 305 309 Jvm minimum; 306 310 minimum.setVersionFromString( "@java.min.version@" ); 307 string hint = "@java.extracted@"; 311 string phint = "@java.extracted@"; 312 string hint = ""; 308 313 bool verbose = true; 309 314 Jvm foundJvm; 310 bool jvmFound = find( foundJvm, use_minimum, minimum, hint, verbose );315 bool jvmFound = find( foundJvm, use_minimum, minimum, phint, hint, verbose ); 311 316 312 317 //if the jvm was not found, try to fix it and find it … … 317 322 318 323 //tell them if java is absent or just too old 319 if ( find( foundJvm, false, minimum, "", false ) ) {324 if ( find( foundJvm, false, minimum, "", "", false ) ) { 320 325 message.append( "your java is too old."); 321 326 } else { … … 361 366 _unlink("ant.install.log"); 362 367 _unlink("@java.installer@"); 363 system("rd /s @java.extracted@");368 system("rd /s /q @java.extracted@"); 364 369 SetCurrentDirectory(".."); 365 370 _rmdir( tempdir.c_str() );
Note:
See TracChangeset
for help on using the changeset viewer.