diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-17 16:37:48 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-17 16:37:48 +0100 |
| commit | 64e585da09339be629f05195cfcff7b01dcb0497 (patch) | |
| tree | 9dd719002fa6dc372154c0adefe1855e55890616 /erts/etc/win32/nsis/erlang20.nsi | |
| parent | 2b0c190aa88716b24866b0a751cfe6252348ab00 (diff) | |
| parent | a0e362765d9d4afb0211f49eb787d2139b3eb7be (diff) | |
| download | otp-64e585da09339be629f05195cfcff7b01dcb0497.tar.gz otp-64e585da09339be629f05195cfcff7b01dcb0497.tar.bz2 otp-64e585da09339be629f05195cfcff7b01dcb0497.zip | |
Merge tag 'build/maint-r15/2013-01-14_20.31' into maint-r15
Diffstat (limited to 'erts/etc/win32/nsis/erlang20.nsi')
| -rw-r--r-- | erts/etc/win32/nsis/erlang20.nsi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi index c5ada9e3b3..3333c4a9aa 100644 --- a/erts/etc/win32/nsis/erlang20.nsi +++ b/erts/etc/win32/nsis/erlang20.nsi @@ -35,6 +35,7 @@ !include "MUI.nsh"
!include "WordFunc.nsh"
+ !include "WinVer.nsh"
;--------------------------------
;Configuration
@@ -341,6 +342,9 @@ FunctionEnd Function .onInit
Var /GLOBAL archprefix
Var /GLOBAL sysnativedir
+ Var /GLOBAL winvermajor
+ Var /GLOBAL winverminor
+
SectionGetFlags 0 $MYTEMP
StrCmpS ${WINTYPE} "win64" +1 +4
StrCpy $archprefix "amd64"
@@ -348,9 +352,16 @@ Function .onInit Goto +3
StrCpy $archprefix "x86"
StrCpy $sysnativedir $SYSDIR
- ;MessageBox MB_YESNO "Found $sysnativedir\${REDIST_DLL_NAME}" IDYES FoundLbl
+ ${WinVerGetMajor} $0
+ ${WinVerGetMinor} $1
+ StrCpy $winvermajor $0
+ StrCpy $winverminor $1
IfFileExists $sysnativedir\${REDIST_DLL_NAME} MaybeFoundInSystemLbl
SearchSxSLbl:
+ IntCmp $winvermajor 6 WVCheckMinorLbl WVCheckDoneLbl NotFoundLbl
+ WVCheckMinorLbl:
+ IntCmp $winverminor 1 WVCheckDoneLbl WVCheckDoneLbl NotFoundLbl
+ WVCheckDoneLbl:
FindFirst $0 $1 $WINDIR\WinSxS\$archprefix*
LoopLbl:
StrCmp $1 "" NotFoundLbl
|