Changes to the NSIS installer for Windows to support KFW 2.6.1

Adds kvno.exe, gss-client.exe, and gss-server.exe to the distribution
Increments the version number of the installer

ticket: new
tags: pullup
target_version: 1.3.4

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16249 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 25 insertions, 6 deletions

diff --git a/src/windows/installer/nsis/ChangeLog b/src/windows/installer/nsis/ChangeLog
index da4ab98..5680a56 100644
--- a/src/windows/installer/nsis/ChangeLog
+++ b/src/windows/installer/nsis/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-14  Jeffrey Altman <jaltman@mit.edu>
+
+* nsi-includes.nsi:  update version to 2.6.1
+
+* kfw-fixed.nsi:  add kvno.exe, gss-client.exe, gss-server.exe
+
 2004-03-31  Jeffrey Altman <jaltman@mit.edu>
 
 * Add the NSIS installer for KFW 2.6 to the repository
diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi
index 6c027f8..cbfde1f 100644
--- a/src/windows/installer/nsis/kfw-fixed.nsi
+++ b/src/windows/installer/nsis/kfw-fixed.nsi
@@ -2,7 +2,7 @@
 ; KfW defines and functionality
 ; Copyright (c) 2004 Massachusetts Institute of Technology
 
-!define KFW_VERSION "${KFW_MAJORVERSION}.${KFW_MINORVERSION}"
+!define KFW_VERSION "${KFW_MAJORVERSION}.${KFW_MINORVERSION}.${KFW_PATCHLEVEL}"
 
 !define PROGRAM_NAME "Kerberos for Windows"
 !ifdef RELEASE
@@ -165,13 +165,14 @@ Section "KfW Client" secClient
   ; Stop any running services or we can't replace the files
   ; Stop the running processes
   GetTempFileName $R0
-  File /oname=$R0 "Killer.exe"   ; Might not have the C Runtime Library to run
+  File /oname=$R0 "Killer.exe"
   nsExec::Exec '$R0 leash32.exe'
   nsExec::Exec '$R0 krbcc32s.exe'
   nsExec::Exec '$R0 k95.exe'
   nsExec::Exec '$R0 k95g.exe'
   nsExec::Exec '$R0 krb5.exe'
   nsExec::Exec '$R0 gss.exe'
+  nsExec::Exec '$R0 afscreds.exe'
 
   RMDir /r "$INSTDIR\bin"
 
@@ -180,12 +181,15 @@ Section "KfW Client" secClient
   File "${KFW_BIN_DIR}\aklog.exe"
   File "${KFW_BIN_DIR}\comerr32.dll"
   File "${KFW_BIN_DIR}\gss.exe"
+  File "${KFW_BIN_DIR}\gss-client.exe"
+  File "${KFW_BIN_DIR}\gss-server.exe"
   File "${KFW_BIN_DIR}\gssapi32.dll"
   File "${KFW_BIN_DIR}\k524init.exe"
   File "${KFW_BIN_DIR}\kclnt32.dll"
   File "${KFW_BIN_DIR}\kdestroy.exe"
   File "${KFW_BIN_DIR}\kinit.exe"
   File "${KFW_BIN_DIR}\klist.exe"
+  File "${KFW_BIN_DIR}\kvno.exe"
   File "${KFW_BIN_DIR}\krb5_32.dll"
   File "${KFW_BIN_DIR}\krb524.dll"
   File "${KFW_BIN_DIR}\krbcc32.dll"
@@ -206,12 +210,15 @@ Section "KfW Client" secClient
   File "${KFW_BIN_DIR}\aklog.pdb"
   File "${KFW_BIN_DIR}\comerr32.pdb"
   File "${KFW_BIN_DIR}\gss.pdb"
+  File "${KFW_BIN_DIR}\gss-client.pdb"
+  File "${KFW_BIN_DIR}\gss-server.pdb"
   File "${KFW_BIN_DIR}\gssapi32.pdb"
   File "${KFW_BIN_DIR}\k524init.pdb"
   File "${KFW_BIN_DIR}\kclnt32.pdb"
   File "${KFW_BIN_DIR}\kdestroy.pdb"
   File "${KFW_BIN_DIR}\kinit.pdb"
   File "${KFW_BIN_DIR}\klist.pdb"
+  File "${KFW_BIN_DIR}\kvno.pdb"
   File "${KFW_BIN_DIR}\krb5_32.pdb"
   File "${KFW_BIN_DIR}\krb524.pdb"
   File "${KFW_BIN_DIR}\krbcc32.pdb"
@@ -833,12 +840,15 @@ StartRemove:
    Delete /REBOOTOK "$INSTDIR\bin\aklog.exe"
    Delete /REBOOTOK "$INSTDIR\bin\comerr32.dll"
    Delete /REBOOTOK "$INSTDIR\bin\gss.exe"
+   Delete /REBOOTOK "$INSTDIR\bin\gss-client.exe"
+   Delete /REBOOTOK "$INSTDIR\bin\gss-server.exe"
    Delete /REBOOTOK "$INSTDIR\bin\gssapi32.dll"
    Delete /REBOOTOK "$INSTDIR\bin\k524init.exe"
    Delete /REBOOTOK "$INSTDIR\bin\kclnt32.dll"
    Delete /REBOOTOK "$INSTDIR\bin\kdestroy.exe"
    Delete /REBOOTOK "$INSTDIR\bin\kinit.exe"
    Delete /REBOOTOK "$INSTDIR\bin\klist.exe"   
+   Delete /REBOOTOK "$INSTDIR\bin\kvno.exe"   
    Delete /REBOOTOK "$INSTDIR\bin\krb5_32.dll" 
    Delete /REBOOTOK "$INSTDIR\bin\krb524.dll"  
    Delete /REBOOTOK "$INSTDIR\bin\krbcc32.dll" 
@@ -858,12 +868,15 @@ StartRemove:
    Delete /REBOOTOK "$INSTDIR\bin\aklog.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\comerr32.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\gss.pdb"
+   Delete /REBOOTOK "$INSTDIR\bin\gss-client.pdb"
+   Delete /REBOOTOK "$INSTDIR\bin\gss-server.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\gssapi32.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\k524init.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\kclnt32.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\kdestroy.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\kinit.pdb"
    Delete /REBOOTOK "$INSTDIR\bin\klist.pdb"   
+   Delete /REBOOTOK "$INSTDIR\bin\kvno.pdb"   
    Delete /REBOOTOK "$INSTDIR\bin\krb5_32.pdb" 
    Delete /REBOOTOK "$INSTDIR\bin\krb524.pdb"  
    Delete /REBOOTOK "$INSTDIR\bin\krbcc32.pdb" 
diff --git a/src/windows/installer/nsis/nsi-includes.nsi b/src/windows/installer/nsis/nsi-includes.nsi
index e5b4580..4bec5ae 100644
--- a/src/windows/installer/nsis/nsi-includes.nsi
+++ b/src/windows/installer/nsis/nsi-includes.nsi
@@ -1,8 +1,8 @@
-!define KFW_TARGETDIR c:\temp\kfw\kfw-2.6
-!define KFW_EXTRADIR  c:\temp\kfw\kfw-2.5-extra
-!define KFW_VERSION 2.6
+!define KFW_TARGETDIR c:\temp\kfw\kfw-2.6.1
+!define KFW_EXTRADIR  c:\temp\kfw\kfw-2.6-extra
+!define KFW_VERSION 2.6.1
 !define KFW_MAJORVERSION 2
 !define KFW_MINORVERSION 6
-!define KFW_PATCHLEVEL 0000
+!define KFW_PATCHLEVEL 1000
 !define CL_1310