Windows: update nsis installer for hcrypto and roken

[openafs.git] / src / WINNT / install / NSIS / OpenAFS.nsi

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 3786b77..955c067 100644 (file)
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -546,7 +546,6 @@ Section "!AFS Client" secClient
   SetOutPath "$INSTDIR\Client\Program"
   File "${AFS_CLIENT_BUILDDIR}\afsshare.exe"
   !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\libosi.dll" "$INSTDIR\Client\Program\libosi.dll" "$INSTDIR"
-  !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\libafsconf.dll" "$INSTDIR\Client\Program\libafsconf.dll" "$INSTDIR"
   File "${AFS_CLIENT_BUILDDIR}\klog.exe"
   File "${AFS_CLIENT_BUILDDIR}\tokens.exe"
   File "${AFS_CLIENT_BUILDDIR}\unlog.exe"
@@ -559,7 +558,7 @@ Section "!AFS Client" secClient
   !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afsd_service.exe" "$INSTDIR\Client\Program\afsd_service.exe" "$INSTDIR"
   File "${AFS_CLIENT_BUILDDIR}\symlink.exe"
   File "${AFS_DESTDIR}\bin\kpasswd.exe"
-  File "${AFS_SERVER_BUILDDIR}\pts.exe"
+  File "${AFS_DESTDIR}\bin\pts.exe"
   File "${AFS_SERVER_BUILDDIR}\bos.exe"
   File "${AFS_SERVER_BUILDDIR}\kas.exe"
   File "${AFS_SERVER_BUILDDIR}\vos.exe"
@@ -576,6 +575,8 @@ Section "!AFS Client" secClient
   File "${AFS_CLIENT_BUILDDIR}\afscpcc.exe"
 
   ; Remove the binaries from the old location if present
+  Delete /REBOOTOK "$INSTDIR\Client\Program\libafsconf.dll"
+  Delete "$INSTDIR\Client\Program\libafsconf.pdb"
   Delete /REBOOTOK "$SYSDIR\afslogon.dll"
   Delete "$SYSDIR\afscpcc.exe"
   Delete "$SYSDIR\afslogon.pdb"
@@ -869,6 +870,8 @@ skipCheck:
   File "${AFS_SERVER_BUILDDIR}\vlserver.exe"
   File "${AFS_SERVER_BUILDDIR}\volinfo.exe"
   File "${AFS_SERVER_BUILDDIR}\volserver.exe"
+  File "${AFS_DESTDIR}\bin\ptclient.exe"
+  File "${AFS_DESTDIR}\bin\pt_util.exe"
  
  ;AFS Server common files
  SetOutPath "$INSTDIR\Common"
@@ -1023,17 +1026,23 @@ Section /o "Supplemental Documentation" secDocs
    
    
 DoEnglish:
+   CreateDirectory "$INSTDIR\Documentation"
+   SetOutPath "$INSTDIR\Documentation\"
+   File /oname=AdminGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
+   File /oname=UserGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
+   CreateDirectory "$INSTDIR\Documentation\html"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef"
    File "..\..\..\..\doc\man-pages\html\*"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef\1"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef\1"
    File "..\..\..\..\doc\man-pages\html\1\*"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef\5"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef\5"
    File "..\..\..\..\doc\man-pages\html\5\*"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef\8"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef\8"
    File "..\..\..\..\doc\man-pages\html\8\*"
-   SetOutPath "$INSTDIR\Documentation\"
-   File /oname=AdminGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
-   File /oname=UserGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
    goto DoneLanguage
    
 DoGerman:
@@ -1161,7 +1170,8 @@ Section /o "Debug symbols" secDebug
   SetOutPath "$INSTDIR\Client\Program"
   File "${AFS_CLIENT_BUILDDIR}\afsshare.pdb"
   File "${AFS_CLIENT_BUILDDIR}\libosi.pdb"
-  File "${AFS_CLIENT_BUILDDIR}\libafsconf.pdb"
+  ; remove old location if present
+  Delete "$INSTDIR\Client\Program\libafsconf.pdb"
   File "${AFS_CLIENT_BUILDDIR}\klog.pdb"
   File "${AFS_CLIENT_BUILDDIR}\tokens.pdb"
   File "${AFS_CLIENT_BUILDDIR}\unlog.pdb"
@@ -1207,6 +1217,8 @@ DoServer:
   File "${AFS_ETC_BUILDDIR}\fms.pdb"
   File "${AFS_SERVER_BUILDDIR}\kaserver.pdb"
   File "${AFS_SERVER_BUILDDIR}\ptserver.pdb"
+  File "${AFS_DESTDIR}\bin\ptclient.pdb"
+  File "${AFS_DESTDIR}\bin\pt_util.pdb"
   File "${AFS_SERVER_BUILDDIR}\salvager.pdb"
   File "${AFS_SERVER_BUILDDIR}\upclient.pdb"
   File "${AFS_SERVER_BUILDDIR}\upserver.pdb"
@@ -1268,6 +1280,7 @@ DoCommon:
    File "${AFS_DESTDIR}\lib\afsauthent.pdb"
    File "${AFS_DESTDIR}\lib\afspthread.pdb"
    File "${AFS_DESTDIR}\lib\afsrpc.pdb"
+   File "${AFS_DESTDIR}\lib\libafsconf.pdb"
    File "${AFS_SERVER_BUILDDIR}\afsclientadmin.pdb"
    File "${AFS_SERVER_BUILDDIR}\afsprocmgmt.pdb"
    File "${AFS_SERVER_BUILDDIR}\afsvosadmin.pdb"
@@ -1693,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"
@@ -1709,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"
@@ -2770,7 +2787,10 @@ Function AFSLangFiles
    File "${AFS_CLIENT_BUILDDIR}\afs_config.exe"
   !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\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" 
   !insertmacro ReplaceDLL "${AFS_SERVER_BUILDDIR}\afsprocmgmt.dll"     "$INSTDIR\Common\afsprocmgmt.dll"     "$INSTDIR" 
@@ -2893,6 +2913,7 @@ Function AFSLangFiles
    
 DoEnglish:
 
+   CreateDirectory "$INSTDIR\Documentation"
    SetOutPath "$INSTDIR\Documentation"
    File /oname=ReleaseNotes.chm "..\..\..\..\doc\xml\ReleaseNotesWindows\htmlhelp.chm"