pull up r18603 from trunk

 r18603@cathode-dark-space:  jaltman | 2006-09-21 12:18:26 -0400
 ticket: new
 subject: NSIS installer - update for Win2K NetIDMgr
 tags: pullup

 	Install the Win2K specific binaries for NetIDMgr on Win2K

ticket: 4310

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@18618 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi
index f812e732635b3743267959bdb4f0e29a7bd3e7a7..3b038c08b1512af89147979736f66b0a95ec97c3 100644 (file)
--- a/src/windows/installer/nsis/kfw-fixed.nsi
+++ b/src/windows/installer/nsis/kfw-fixed.nsi
@@ -207,10 +207,7 @@ Section "KfW Client" secClient
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc32.dll"         "$INSTDIR\bin\krbcc32.dll"       "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc32s.exe"        "$INSTDIR\bin\krbcc32s.exe"      "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbv4w32.dll"        "$INSTDIR\bin\krbv4w32.dll"      "$INSTDIR"
-  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.exe"         "$INSTDIR\bin\netidmgr.exe"       "$INSTDIR"
-  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.exe.manifest" "$INSTDIR\bin\netidmgr.exe.manifest" "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.chm"         "$INSTDIR\bin\netidmgr.chm"       "$INSTDIR"
-  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\nidmgr32.dll"         "$INSTDIR\bin\nidmgr32.dll"       "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb4cred.dll"         "$INSTDIR\bin\krb4cred.dll"       "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred.dll"         "$INSTDIR\bin\krb5cred.dll"       "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb4cred_en_us.dll"   "$INSTDIR\bin\krb4cred_en_us.dll"       "$INSTDIR"
@@ -222,7 +219,18 @@ Section "KfW Client" secClient
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kdeltkt.exe"          "$INSTDIR\bin\kdeltkt.exe"        "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\wshelp32.dll"        "$INSTDIR\bin\wshelp32.dll"      "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\xpprof32.dll"        "$INSTDIR\bin\xpprof32.dll"      "$INSTDIR"
-  
+
+  Call GetWindowsVersion
+  Pop $R0
+  StrCmp $R0 "2000" nid_inst2000
+  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.exe"         "$INSTDIR\bin\netidmgr.exe"       "$INSTDIR"
+  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\nidmgr32.dll"         "$INSTDIR\bin\nidmgr32.dll"       "$INSTDIR"
+  goto nid_done
+nid_inst2000:  
+  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\W2K\netidmgr.exe"     "$INSTDIR\bin\netidmgr.exe"       "$INSTDIR"
+  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\W2K\nidmgr32.dll"     "$INSTDIR\bin\nidmgr32.dll"       "$INSTDIR"
+nid_done:
+
 !ifdef DEBUG
 !IFDEF CL_1400
   !insertmacro ReplaceDLL "${SYSTEMDIR}\msvcr80d.dll"    "$INSTDIR\bin\msvcr80d.dll"  "$INSTDIR"
@@ -481,8 +489,6 @@ Section "Debug Symbols" secDebug
   File "${KFW_BIN_DIR}\krbcc32s.pdb"
   File "${KFW_BIN_DIR}\krbv4w32.pdb"
   File "${KFW_BIN_DIR}\leashw32.pdb"
-  File "${KFW_BIN_DIR}\netidmgr.pdb"
-  File "${KFW_BIN_DIR}\nidmgr32.pdb"
   File "${KFW_BIN_DIR}\krb4cred.pdb"
   File "${KFW_BIN_DIR}\krb5cred.pdb"
   File "${KFW_BIN_DIR}\ms2mit.pdb"
@@ -492,6 +498,17 @@ Section "Debug Symbols" secDebug
   File "${KFW_BIN_DIR}\wshelp32.pdb"
   File "${KFW_BIN_DIR}\xpprof32.pdb"
 
+  Call GetWindowsVersion
+  Pop $R0
+  StrCmp $R0 "2000" nidpdb_inst2000
+  File "${KFW_BIN_DIR}\netidmgr.pdb"
+  File "${KFW_BIN_DIR}\nidmgr32.pdb"
+  goto nidpdb_done
+nidpdb_inst2000:
+  File "${KFW_BIN_DIR}\W2K\netidmgr.pdb"
+  File "${KFW_BIN_DIR}\W2K\nidmgr32.pdb"
+nidpdb_done:
+
 !IFDEF DEBUG
 !IFDEF CL_1400
   File "${SYSTEMDIR}\msvcr80d.pdb"