Mercurial > mxe-octave
comparison tools/makeinst-script.sh.in @ 4385:722693b132ad
nsis installer: suppress warninga in silent mode
* tools/makeinst-script.sh.in: add /SD option to any non error messagebox calls
| author | John D |
|---|---|
| date | Thu, 04 May 2017 11:12:04 -0400 |
| parents | 2f1309f19b49 |
| children | 05b44661c970 |
comparison
equal
deleted
inserted
replaced
| 4384:d5a5b8e659de | 4385:722693b132ad |
|---|---|
| 411 Delete "\$INSTDIR\\*.*" | 411 Delete "\$INSTDIR\\*.*" |
| 412 RmDir "\$INSTDIR" | 412 RmDir "\$INSTDIR" |
| 413 | 413 |
| 414 ; didnt remove directory ? most likely from not all files removed | 414 ; didnt remove directory ? most likely from not all files removed |
| 415 IfErrors 0 uninstall_done | 415 IfErrors 0 uninstall_done |
| 416 MessageBox MB_YESNO "One or more folders were not uninstalled because they contain extra files. Try to delete them?" IDNO uninstall_done | 416 MessageBox MB_YESNO "One or more folders were not uninstalled because they contain extra files. Try to delete them?" /SD IDYES IDNO uninstall_done |
| 417 RMDir /r "\$INSTDIR" | 417 RMDir /r "\$INSTDIR" |
| 418 | 418 |
| 419 IfErrors 0 uninstall_done | 419 IfErrors 0 uninstall_done |
| 420 MessageBox MB_YESNO "One of more files were still not uninstalled. Do you want to delete them on the next reboot?" IDNO uninstall_done | 420 MessageBox MB_YESNO "One of more files were still not uninstalled. Do you want to delete them on the next reboot?" /SD IDYES IDNO uninstall_done |
| 421 RMDir /r /REBOOTOK "\$INSTDIR" | 421 RMDir /r /REBOOTOK "\$INSTDIR" |
| 422 uninstall_done: | 422 uninstall_done: |
| 423 | 423 |
| 424 SectionEnd | 424 SectionEnd |
| 425 | 425 |
| 443 StrCmp \$1 6 is_winnt_10 ; Checking for future versions of Windows 10+ | 443 StrCmp \$1 6 is_winnt_10 ; Checking for future versions of Windows 10+ |
| 444 Goto is_error | 444 Goto is_error |
| 445 | 445 |
| 446 is_winnt_10: | 446 is_winnt_10: |
| 447 | 447 |
| 448 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Setup has detected Windows 10 installed on your system. Octave is currently not fully tested on Windows 10. Testers are welcome to provide feedback. Do you want to proceed with the installation anyway?" IDYES done IDNO 0 | 448 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Setup has detected Windows 10 installed on your system. Octave is currently not fully tested on Windows 10. Testers are welcome to provide feedback. Do you want to proceed with the installation anyway?" /SD IDYES IDYES done IDNO 0 |
| 449 Abort | 449 Abort |
| 450 is_winnt_XP: | 450 is_winnt_XP: |
| 451 is_winnt_2003: | 451 is_winnt_2003: |
| 452 is_winnt_vista: | 452 is_winnt_vista: |
| 453 is_winnt_7: | 453 is_winnt_7: |
| 481 | 481 |
| 482 ; Check whether prev install is here and no spaces in dest name | 482 ; Check whether prev install is here and no spaces in dest name |
| 483 Function CheckPrevInstallAndDest | 483 Function CheckPrevInstallAndDest |
| 484 IfFileExists "\$INSTDIR\\bin\\octave.exe" inst_exists inst_none | 484 IfFileExists "\$INSTDIR\\bin\\octave.exe" inst_exists inst_none |
| 485 inst_exists: | 485 inst_exists: |
| 486 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Another Octave installation has been detected at that destination. It is recommended to uninstall it if you intend to use the same installation directory. Do you want to proceed with the installation anyway?" IDYES inst_none IDNO 0 | 486 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Another Octave installation has been detected at that destination. It is recommended to uninstall it if you intend to use the same installation directory. Do you want to proceed with the installation anyway?" /SD IDYES IDYES inst_none IDNO 0 |
| 487 Abort | 487 Abort |
| 488 GoTo inst_end | 488 GoTo inst_end |
| 489 inst_none: | 489 inst_none: |
| 490 | 490 |
| 491 | 491 |
| 542 | 542 |
| 543 IfErrors 0 continue ;; 2) found it in the registry | 543 IfErrors 0 continue ;; 2) found it in the registry |
| 544 IfErrors JRE_Error | 544 IfErrors JRE_Error |
| 545 | 545 |
| 546 JRE_Error: | 546 JRE_Error: |
| 547 MessageBox MB_ICONEXCLAMATION|MB_YESNO "Octave has the capability to call Java libraries, but the installer was unable to find a Java Runtime Environment (JRE) on this system. Octave will still function without a JRE, only certain specific functions will be disabled. If a JRE is installed later, Octave should be able to detect and use it automatically. Continue with installation?" IDYES continue | 547 MessageBox MB_ICONEXCLAMATION|MB_YESNO "Octave has the capability to call Java libraries, but the installer was unable to find a Java Runtime Environment (JRE) on this system. Octave will still function without a JRE, only certain specific functions will be disabled. If a JRE is installed later, Octave should be able to detect and use it automatically. Continue with installation?" /SD IDYES IDYES continue |
| 548 Abort | 548 Abort |
| 549 continue: | 549 continue: |
| 550 Pop \$R1 | 550 Pop \$R1 |
| 551 Pop \$R0 | 551 Pop \$R0 |
| 552 EOF | 552 EOF |