jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

windows-nsis-installer-20070115

Browse Source 
Fix the RPC check to actually check the RPC status

Update the copyright date

Add Vista version detection
This commit is contained in:
Jeffrey Altman 2007-01-15 23:40:38 +00:00
parent 20f4265686
commit d32af98079
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/WINNT/install/NSIS/OpenAFS.nsi
View File

@ -50,7 +50,7 @@ VIAddVersionKey "CompanyName" "OpenAFS.org"
VIAddVersionKey "ProductVersion" ${AFS_VERSION}
VIAddVersionKey "FileVersion" ${AFS_VERSION}
VIAddVersionKey "FileDescription" "OpenAFS for Windows Installer"
VIAddVersionKey "LegalCopyright" "(C)2000-2005"
VIAddVersionKey "LegalCopyright" "(C)2000-2007"
!ifdef DEBUG
VIAddVersionKey "PrivateBuild" "Checked/Debug"
!endif ; End DEBUG
@ -1303,13 +1303,13 @@ contInstall:
; Check that RPC functions are installed (I believe any one of these can be present for
; OpenAFS to work)
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_np"
StrCmp $R0 "rpcrt4.dll" contInstall2
StrCmp $R0 "rpcrt4.dll" +1 contInstall2
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_ip_tcp"
StrCmp $R0 "rpcrt4.dll" contInstall2
StrCmp $R0 "rpcrt4.dll" +1 contInstall2
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncadg_ip_udp"
StrCmp $R0 "rpcrt4.dll" contInstall2
StrCmp $R0 "rpcrt4.dll" +1 contInstall2
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http"
StrCmp $R0 "rpcrt4.dll" contInstall2
StrCmp $R0 "rpcrt4.dll" +1 contInstall2
MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST "An error was detected with your Windows RPC installation. Please make sure Windows RPC is installed before installing OpenAFS."
Abort
@ -3654,7 +3654,7 @@ FunctionEnd
;
; Returns on top of stack
;
; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)
; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista)
; or
; '' (Unknown Windows Version)
;
@ -3710,7 +3710,8 @@ Function GetWindowsVersion
StrCmp $R1 '5.0' lbl_winnt_2000
StrCmp $R1 '5.1' lbl_winnt_XP
StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error
StrCmp $R1 '5.2' lbl_winnt_2003
StrCmp $R1 '6.0' lbl_winnt_vista lbl_error
lbl_winnt_x:
StrCpy $R0 "NT $R0" 6
@ -3728,6 +3729,10 @@ Function GetWindowsVersion
Strcpy $R0 '2003'
Goto lbl_done
lbl_winnt_vista:
Strcpy $R0 'Vista'
Goto lbl_done
lbl_error:
Strcpy $R0 ''
lbl_done: