Mercurial > mxe-octave
comparison makeinst-script.sh @ 4120:f2d7bb7777da
installer: dont warn on experimental for win10 (Bug #47576)
* makeinst-script.sh: check for win10 and show warning, remove win8 warning.
author | John Donoghue |
---|---|
date | Fri, 01 Apr 2016 10:45:14 -0400 |
parents | 423925d2c032 |
children | 1c3be8c68d3f |
comparison
equal
deleted
inserted
replaced
4119:0db86306c404 | 4120:f2d7bb7777da |
---|---|
128 ###################################################################### | 128 ###################################################################### |
129 | 129 |
130 RequestExecutionLevel admin | 130 RequestExecutionLevel admin |
131 | 131 |
132 ###################################################################### | 132 ###################################################################### |
133 ; Win 8 detection | |
134 Var IsWin8 | |
135 | 133 |
136 ; custom options page functions | 134 ; custom options page functions |
137 | 135 |
138 Var InstallAllUsers | 136 Var InstallAllUsers |
139 Var InstallAllUsersCtrl | 137 Var InstallAllUsersCtrl |
197 FunctionEnd | 195 FunctionEnd |
198 | 196 |
199 ###################################################################### | 197 ###################################################################### |
200 | 198 |
201 Function .onInit | 199 Function .onInit |
202 Call DetectWinVer | 200 Call CheckWinVer |
203 Call CheckCurrVersion | 201 Call CheckCurrVersion |
204 Call CheckJRE | 202 Call CheckJRE |
205 InitPluginsDir | 203 InitPluginsDir |
206 FunctionEnd | 204 FunctionEnd |
207 | 205 |
402 uninstall_done: | 400 uninstall_done: |
403 | 401 |
404 SectionEnd | 402 SectionEnd |
405 | 403 |
406 ; Function to detect Windows version and abort if Octave is unsupported in the current platform | 404 ; Function to detect Windows version and abort if Octave is unsupported in the current platform |
407 Function DetectWinVer | 405 Function CheckWinVer |
408 Push \$0 | 406 Push \$0 |
409 Push \$1 | 407 Push \$1 |
410 | |
411 StrCpy \$IsWin8 0 | |
412 | 408 |
413 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" CurrentVersion | 409 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" CurrentVersion |
414 IfErrors is_error is_winnt | 410 IfErrors is_error is_winnt |
415 is_winnt: | 411 is_winnt: |
416 StrCpy \$1 \$0 1 | 412 StrCpy \$1 \$0 1 |
419 StrCmp \$0 "5.1" is_winnt_XP | 415 StrCmp \$0 "5.1" is_winnt_XP |
420 StrCmp \$0 "5.2" is_winnt_2003 | 416 StrCmp \$0 "5.2" is_winnt_2003 |
421 StrCmp \$0 "6.0" is_winnt_vista | 417 StrCmp \$0 "6.0" is_winnt_vista |
422 StrCmp \$0 "6.1" is_winnt_7 | 418 StrCmp \$0 "6.1" is_winnt_7 |
423 StrCmp \$0 "6.2" is_winnt_8 | 419 StrCmp \$0 "6.2" is_winnt_8 |
424 StrCmp \$1 6 is_winnt_8 ; Checking for future versions of Windows 8 | 420 StrCmp \$0 "6.3" is_winnt_10 |
421 StrCmp \$1 6 is_winnt_10 ; Checking for future versions of Windows 10+ | |
425 Goto is_error | 422 Goto is_error |
426 | 423 |
427 is_winnt_8: | 424 is_winnt_10: |
428 StrCpy \$IsWin8 1 | 425 |
429 | 426 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 welcom to provide feedback. Do you want to proceed with the installation anyway?" IDYES done IDNO 0 |
430 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Setup has detected Windows 8 installed on your system. Octave is currently not fully supported on Windows 8. If you choose to continue with the installation, you might not be able to access Octave GUI. Do you want to proceed with the installation anyway?" IDYES done IDNO 0 | |
431 Abort | 427 Abort |
432 is_winnt_XP: | 428 is_winnt_XP: |
433 is_winnt_2003: | 429 is_winnt_2003: |
434 is_winnt_vista: | 430 is_winnt_vista: |
435 is_winnt_7: | 431 is_winnt_7: |
432 is_winnt_8: | |
436 Goto done | 433 Goto done |
437 is_error: | 434 is_error: |
438 StrCpy \$1 \$0 | 435 StrCpy \$1 \$0 |
439 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" ProductName | 436 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" ProductName |
440 IfErrors 0 +4 | 437 IfErrors 0 +4 |