Mercurial > mxe-octave
changeset 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 | 0db86306c404 |
children | 1c3be8c68d3f |
files | makeinst-script.sh |
diffstat | 1 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/makeinst-script.sh Wed Mar 30 16:32:20 2016 -0700 +++ b/makeinst-script.sh Fri Apr 01 10:45:14 2016 -0400 @@ -130,8 +130,6 @@ RequestExecutionLevel admin ###################################################################### -; Win 8 detection -Var IsWin8 ; custom options page functions @@ -199,7 +197,7 @@ ###################################################################### Function .onInit - Call DetectWinVer + Call CheckWinVer Call CheckCurrVersion Call CheckJRE InitPluginsDir @@ -404,12 +402,10 @@ SectionEnd ; Function to detect Windows version and abort if Octave is unsupported in the current platform -Function DetectWinVer +Function CheckWinVer Push \$0 Push \$1 - StrCpy \$IsWin8 0 - ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" CurrentVersion IfErrors is_error is_winnt is_winnt: @@ -421,18 +417,19 @@ StrCmp \$0 "6.0" is_winnt_vista StrCmp \$0 "6.1" is_winnt_7 StrCmp \$0 "6.2" is_winnt_8 - StrCmp \$1 6 is_winnt_8 ; Checking for future versions of Windows 8 + StrCmp \$0 "6.3" is_winnt_10 + StrCmp \$1 6 is_winnt_10 ; Checking for future versions of Windows 10+ Goto is_error -is_winnt_8: - StrCpy \$IsWin8 1 +is_winnt_10: - 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 + 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 Abort is_winnt_XP: is_winnt_2003: is_winnt_vista: is_winnt_7: +is_winnt_8: Goto done is_error: StrCpy \$1 \$0