Revision 9311
| trunk/install/launcher/izpack-launcher-1.3/dist/launcher-Win32.ini | ||
|---|---|---|
| 38 | 38 |
; * no(debera estar especificado el parametro'jre_home'):{distinto de los anterirores}
|
| 39 | 39 |
doChecks = YES |
| 40 | 40 |
|
| 41 |
; Realizar la comprobacion de codigo que |
|
| 42 |
; retorna la JRE |
|
| 43 |
; * si(por defecto):S SI YES Y 1 |
|
| 44 |
; * no:{distinto de los anterirores}
|
|
| 45 |
checksJREExecutionTerminationCode = YES |
|
| 46 |
|
|
| 47 |
|
|
| 48 |
|
|
| 41 | 49 |
; Ruta el Java_home a usar en caso de 'doChecks-->No' |
| 42 | 50 |
jre_home = |
| 43 | 51 |
;ejemplo: jre_home = C:/Archivos de programa/Java/j2re1.4.2_11 |
| trunk/install/launcher/izpack-launcher-1.3/src/launcher.h | ||
|---|---|---|
| 63 | 63 |
wxString paramsJaiIoDownload; |
| 64 | 64 |
bool paramsEnabledDownload; |
| 65 | 65 |
bool paramsDoChecks; |
| 66 |
bool paramsChecksJREExecutionTerminationCode; |
|
| 66 | 67 |
wxString paramsJreHome; |
| 67 | 68 |
StatusDialog* statusDialog; |
| 68 | 69 |
bool isStatusDialogVisible; |
| trunk/install/launcher/izpack-launcher-1.3/src/launcher.ini | ||
|---|---|---|
| 37 | 37 |
; * no:{distinto de los anterirores}
|
| 38 | 38 |
doChecks = YES |
| 39 | 39 |
|
| 40 |
; Realizar la comprobacion de codigo que |
|
| 41 |
; retorna la JRE |
|
| 42 |
; * si(por defecto):S SI YES Y 1 |
|
| 43 |
; * no:{distinto de los anterirores}
|
|
| 44 |
checksJREExecutionTerminationCode = YES |
|
| 40 | 45 |
|
| 41 | 46 |
; Habilita la pregunta al usuario de si hay que hacer las comprobaciones de JRE etc... |
| 42 | 47 |
; - por defecto se hace la pregunta |
| trunk/install/launcher/izpack-launcher-1.3/src/launcher.cpp | ||
|---|---|---|
| 134 | 134 |
wxString launchJarAsync; |
| 135 | 135 |
wxString askForCheckingProcess; |
| 136 | 136 |
wxString doChecks; |
| 137 |
wxString checksJREExecutionTerminationCode; |
|
| 137 | 138 |
|
| 138 | 139 |
paramsApplicationName = readPathFromINI( "appname","gvSIG"); |
| 139 | 140 |
paramsJar = readPathFromINI( "jar",wxEmptyString); |
| ... | ... | |
| 150 | 151 |
launchJarAsync = readFromINI( "launchJarAsync", wxEmptyString); |
| 151 | 152 |
askForCheckingProcess = readFromINI( "askForCheckingProcess", wxEmptyString); |
| 152 | 153 |
doChecks = readFromINI( "doChecks",wxEmptyString); |
| 154 |
checksJREExecutionTerminationCode = readFromINI( "checksJREExecutionTerminationCode",wxEmptyString); |
|
| 153 | 155 |
paramsJreHome = readPathFromINI( "jre_home", wxEmptyString); |
| 154 | 156 |
paramsLaunchMode = readPathFromINI( "launchMode", wxEmptyString); |
| 155 | 157 |
|
| ... | ... | |
| 164 | 166 |
paramsAskForCheckingProcess=string_to_bool(askForCheckingProcess,true); |
| 165 | 167 |
//procesamos el parametro booleano 'askForCheckingProcess' |
| 166 | 168 |
paramsDoChecks=string_to_bool(doChecks,true); |
| 169 |
//procesamos el parametro booleano 'checksJREExecutionTerminationCode' |
|
| 170 |
paramsChecksJREExecutionTerminationCode=string_to_bool(checksJREExecutionTerminationCode,true); |
|
| 167 | 171 |
|
| 168 | 172 |
if (paramsCommand == wxEmptyString ) |
| 169 | 173 |
{
|
| ... | ... | |
| 412 | 416 |
} |
| 413 | 417 |
wxString cmd = parseCommand(); |
| 414 | 418 |
//echo(cmd); |
| 419 |
bool isOk=true; |
|
| 415 | 420 |
if (paramsLaunchJarAsync) {
|
| 416 | 421 |
if (!run_external_async(cmd)) |
| 417 | 422 |
{
|
| 418 |
error(cmd.Format(_("The command\n%s\ncould not be executed."),cmd.c_str()));
|
|
| 423 |
isOk=false;
|
|
| 419 | 424 |
} |
| 420 | 425 |
} else {
|
| 421 | 426 |
if (!run_external(cmd)) |
| 422 | 427 |
{
|
| 423 |
error(cmd.Format(_("The command\n%s\ncould not be executed."),cmd.c_str()));
|
|
| 428 |
isOk=false;
|
|
| 424 | 429 |
} |
| 425 | 430 |
} |
| 431 |
|
|
| 432 |
if (!isOk) {
|
|
| 433 |
if (paramsChecksJREExecutionTerminationCode) {
|
|
| 434 |
error( |
|
| 435 |
cmd.Format( |
|
| 436 |
_("The command\n%s\ncould not be executed."),
|
|
| 437 |
cmd.c_str() |
|
| 438 |
) |
|
| 439 |
); |
|
| 440 |
} |
|
| 441 |
} |
|
| 426 | 442 |
|
| 427 | 443 |
completed = true; |
| 428 | 444 |
} |
Also available in: Unified diff