Revision 10374
| trunk/install/launcher/izpack-launcher-1.3/src/launcher.cpp | ||
|---|---|---|
| 299 | 299 |
|
| 300 | 300 |
void LauncherApp::fixSystemJREConfig(){
|
| 301 | 301 |
showStatusMsg(_("Updating the system..."));
|
| 302 |
if (localVersionToUse.Len() <= 5){
|
|
| 303 |
// Estamos usando la rama x.x o x.x.x, no hace falta arreglar nada |
|
| 304 |
return; |
|
| 305 |
} |
|
| 302 | 306 |
//actualizamos CurrentVersion |
| 303 | 307 |
wxString baseKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft" |
| 304 | 308 |
"\\Java Runtime Environment\\"; |
| ... | ... | |
| 387 | 391 |
return false; |
| 388 | 392 |
} |
| 389 | 393 |
|
| 394 |
wxString strTemp; |
|
| 395 |
wxRegKey sKey(baseKey); |
|
| 390 | 396 |
if (!compareVersions(version, paramsJreVersionPrefered)){
|
| 391 | 397 |
//Nos recorremos las versiones instaladas |
| 392 | 398 |
version = ""; |
| 393 |
wxString strTemp; |
|
| 394 |
wxRegKey sKey(baseKey); |
|
| 395 | 399 |
if (sKey.HasSubKey(paramsJreVersionPrefered)) {
|
| 396 | 400 |
version = wxString(paramsJreVersionPrefered); |
| 397 | 401 |
} else {
|
| 398 |
for(unsigned i=20;i>1;i--) {
|
|
| 402 |
for(unsigned i=20;i>1;i--) {
|
|
| 399 | 403 |
strTemp = wxString::Format(paramsJreVersion + "_%02d",i); |
| 400 | 404 |
if (sKey.HasSubKey(strTemp)) {
|
| 401 |
version = strTemp;
|
|
| 402 |
break;
|
|
| 403 |
}
|
|
| 404 |
}
|
|
| 405 |
version = strTemp;
|
|
| 406 |
break;
|
|
| 407 |
} |
|
| 408 |
}
|
|
| 405 | 409 |
} |
| 406 | 410 |
} |
| 407 | 411 |
|
| 412 |
if (version == "") {
|
|
| 413 |
// comprobando x.x |
|
| 414 |
strTemp = paramsJreVersion.Left(3); |
|
| 415 |
if (sKey.HasSubKey(strTemp)) {
|
|
| 416 |
version = strTemp; |
|
| 417 |
} else {
|
|
| 418 |
if (paramsJreVersion.Len() >= 5) {
|
|
| 419 |
// comprobando x.x.x |
|
| 420 |
strTemp = paramsJreVersion.Left(5); |
|
| 421 |
if (sKey.HasSubKey(strTemp)) {
|
|
| 422 |
version = strTemp; |
|
| 423 |
} |
|
| 424 |
} |
|
| 425 |
|
|
| 426 |
} |
|
| 427 |
} |
|
| 408 | 428 |
|
| 409 | 429 |
if (version == "") {
|
| 430 |
// comprobando x.x.0 |
|
| 431 |
strTemp = paramsJreVersion.Left(3)+".0"; |
|
| 432 |
if (sKey.HasSubKey(strTemp)) {
|
|
| 433 |
version = strTemp; |
|
| 434 |
} |
|
| 435 |
} |
|
| 436 |
|
|
| 437 |
if (version == "") {
|
|
| 410 | 438 |
return false; |
| 411 | 439 |
} |
| 412 | 440 |
localVersionToUse = version; |
| ... | ... | |
| 777 | 805 |
calculateJavaExePath(javaHome); |
| 778 | 806 |
} else {
|
| 779 | 807 |
if (paramsAskForCheckingProcess) {
|
| 780 |
wxString msg = _("Do you want to check the application requirements? \nThis will install missing components.");
|
|
| 808 |
wxString msg = _("Do you want to check the application requirements? \nThis will install missing components (Recommended).");
|
|
| 781 | 809 |
doChecks = confirmYesNoCancel(msg,true); |
| 782 | 810 |
if (!doChecks) {
|
| 783 | 811 |
// No quiere comprobacion, por lo que solicitamos |
Also available in: Unified diff