From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 22 Nov 2010 05:05:00 +0000 (-0500)
Subject: Windows: update nsis installer for hcrypto and roken
X-Git-Tag: openafs-devel-1_7_1~1227
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e6a2183f0c21bb12f38962a4c4d61a6511322271

Windows: update nsis installer for hcrypto and roken

Change-Id: I669653fa610908beb33f9a64f05b4d1aa5d28751
Reviewed-on: http://gerrit.openafs.org/3349
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 75a16e5..955c067 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -1706,6 +1706,8 @@ StartRemove:
    Delete /REBOOTOK "$INSTDIR\Common\lib\afsauthent.dll"
    Delete /REBOOTOK "$INSTDIR\Common\lib\afspthread.dll"
    Delete /REBOOTOK "$INSTDIR\Common\lib\afsrpc.dll"
+   Delete /REBOOTOK "$INSTDIR\Common\lib\afshcrypto.dll"
+   Delete /REBOOTOK "$INSTDIR\Common\lib\afsroken.dll"
    Delete /REBOOTOK "$INSTDIR\Common\afsclientadmin.dll"
    Delete /REBOOTOK "$INSTDIR\Common\afsprocmgmt.dll"
    Delete /REBOOTOK "$INSTDIR\Common\afsvosadmin.dll"
@@ -1722,6 +1724,8 @@ StartRemove:
    Delete /REBOOTOK "$INSTDIR\Common\lib\afsauthent.pdb"
    Delete /REBOOTOK "$INSTDIR\Common\lib\afspthread.pdb"
    Delete /REBOOTOK "$INSTDIR\Common\lib\afsrpc.pdb"
+   Delete /REBOOTOK "$INSTDIR\Common\lib\afshcrypto.pdb"
+   Delete /REBOOTOK "$INSTDIR\Common\lib\afsroken.pdb"
    Delete /REBOOTOK "$INSTDIR\Common\afsclientadmin.pdb"
    Delete /REBOOTOK "$INSTDIR\Common\afsprocmgmt.pdb"
    Delete /REBOOTOK "$INSTDIR\Common\afsvosadmin.pdb"
@@ -2784,6 +2788,8 @@ Function AFSLangFiles
   !insertmacro ReplaceDLL "${AFS_DESTDIR}\lib\afsauthent.dll" "$INSTDIR\Common\afsauthent.dll" "$INSTDIR"
   !insertmacro ReplaceDLL "${AFS_DESTDIR}\lib\afspthread.dll" "$INSTDIR\Common\afspthread.dll" "$INSTDIR"
   !insertmacro ReplaceDLL "${AFS_DESTDIR}\lib\afsrpc.dll"     "$INSTDIR\Common\afsrpc.dll"     "$INSTDIR"
+  !insertmacro ReplaceDLL "${AFS_DESTDIR}\lib\afshcrypto.dll" "$INSTDIR\Common\afshcrypto.dll" "$INSTDIR"
+  !insertmacro ReplaceDLL "${AFS_DESTDIR}\lib\afsroken.dll"   "$INSTDIR\Common\afsroken.dll"   "$INSTDIR"
   !insertmacro ReplaceDLL "${AFS_DESTDIR}\lib\libafsconf.dll" "$INSTDIR\Common\libafsconf.dll" "$INSTDIR"
   !insertmacro ReplaceDLL "${AFS_SERVER_BUILDDIR}\afsadminutil.dll"    "$INSTDIR\Common\afsadminutil.dll"    "$INSTDIR"
   !insertmacro ReplaceDLL "${AFS_SERVER_BUILDDIR}\afsclientadmin.dll"  "$INSTDIR\Common\afsclientadmin.dll"  "$INSTDIR"