Revision 6167 trunk/install/launcher/izpack-launcher-1.3/src/launcher.cpp
| launcher.cpp | ||
|---|---|---|
| 333 | 333 |
if (!vKey.QueryValue("JavaHome", javaHome)){
|
| 334 | 334 |
return false; |
| 335 | 335 |
} |
| 336 |
javaExecPath = javaHome + "\\bin\\javaw"; |
|
| 336 |
int osVerMayor; |
|
| 337 |
int osVerMinor; |
|
| 338 |
|
|
| 339 |
wxGetOsVersion(&osVerMayor,&osVerMinor); |
|
| 340 |
if (osVerMayor < 5) {
|
|
| 341 |
javaExecPath = javaHome + "\\bin\\java"; |
|
| 342 |
}else{
|
|
| 343 |
javaExecPath = javaHome + "\\bin\\javaw"; |
|
| 344 |
} |
|
| 345 |
echo("paramsJreVersion=" + paramsJreVersion);
|
|
| 346 |
echo("paramsJreVersionPrefered=" + paramsJreVersionPrefered);
|
|
| 347 |
echo("localVersionToUse=" + localVersionToUse);
|
|
| 348 |
echo("javaHome=" +javaHome);
|
|
| 349 |
echo("javaExecPath=" +javaExecPath);
|
|
| 337 | 350 |
return true; |
| 338 | 351 |
} |
| 339 | 352 |
|
| ... | ... | |
| 484 | 497 |
wxRegKey *pRegKey = new wxRegKey(baseKey); |
| 485 | 498 |
if( !pRegKey->Exists() ) |
| 486 | 499 |
error(_("JRE not found."));
|
| 487 |
if (!pRegKey->QueryValue("CurrentVersion", localVersionToUse)) error(_("JRE not found."));
|
|
| 500 |
if (!pRegKey->QueryValue("CurrentVersion", currentVersion)) error(_("JRE not found."));
|
|
| 488 | 501 |
|
| 502 |
|
|
| 489 | 503 |
isOK=true; |
| 490 | 504 |
if (!checksJaiIo()) {
|
| 491 | 505 |
//confirm(_("JAI ImageIO library is required, Install it?"));
|
| ... | ... | |
| 495 | 509 |
{
|
| 496 | 510 |
isOK=false; |
| 497 | 511 |
} else {
|
| 498 |
pRegKey->SetValue("CurrentVersion",paramsJreVersion);
|
|
| 512 |
pRegKey->SetValue("CurrentVersion",localVersionToUse);
|
|
| 499 | 513 |
showStatusMsg(_("Installing JAI imageIO Library..."));
|
| 500 | 514 |
if (run_external(paramsJaiIo)) |
| 501 | 515 |
{
|
Also available in: Unified diff