pull up r19060 from trunk

 r19060@cathode-dark-space:  jaltman | 2007-01-13 12:08:28 -0500
 ticket: new
 component: windows
 tags: pullup
 subject: Update to KFW NSIS installer

 Update copyright date, samples directory, and shortcut
 to NetIDMgr documentation

ticket: 5344
version_fixed: 1.6.1

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

diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi
index 3b038c08b1512af89147979736f66b0a95ec97c3..c61f5a18ce543bec985c061f11bd6e890e94fab7 100644 (file)
--- a/src/windows/installer/nsis/kfw-fixed.nsi
+++ b/src/windows/installer/nsis/kfw-fixed.nsi
@@ -1,6 +1,7 @@
 ;-----------------------------------------------------------------
 ; KfW defines and functionality
 ; Copyright (c) 2004 Massachusetts Institute of Technology
+; Copyright (c) 2006 Secure Endpoints Inc.
 
 !define KFW_VERSION "${KFW_MAJORVERSION}.${KFW_MINORVERSION}.${KFW_PATCHLEVEL}"
 
@@ -32,7 +33,7 @@ VIAddVersionKey "CompanyName" "Massachusetts Institute of Technology"
 VIAddVersionKey "ProductVersion" ${VIProductVersion}
 VIAddVersionKey "FileVersion" ${VIProductVersion}
 VIAddVersionKey "FileDescription" "MIT Kerberos for Windows Installer"
-VIAddVersionKey "LegalCopyright" "(C)2004,2005"
+VIAddVersionKey "LegalCopyright" "(C)2004,2005,2006"
 !ifdef DEBUG
 VIAddVersionKey "PrivateBuild" "Checked/Debug"
 !endif               ; End DEBUG
@@ -75,6 +76,7 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug"
   !define KFW_DOC_DIR "${KFW_TARGETDIR}\doc"
   !define KFW_INC_DIR "${KFW_TARGETDIR}\inc"
   !define KFW_LIB_DIR "${KFW_TARGETDIR}\lib\i386"
+  !define KFW_SAMPLE_DIR "${KFW_TARGETDIR}\sample"
   !define KFW_INSTALL_DIR "${KFW_TARGETDIR}\install"
   !define SYSTEMDIR   "$%SystemRoot%\System32" 
  
@@ -546,6 +548,7 @@ Section "KfW SDK" secSDK
   RMDir /r "$INSTDIR\inc"
   RMDir /r "$INSTDIR\lib"
   RMDir /r "$INSTDIR\install"
+  RMDir /r "$INSTDIR\sample"
 
   SetOutPath "$INSTDIR\doc"
   File /r "${KFW_DOC_DIR}\netiddev.chm"
@@ -580,6 +583,9 @@ Section "KfW SDK" secSDK
   SetOutPath "$INSTDIR\install"
   File /r "${KFW_INSTALL_DIR}\*"
 
+  SetOutPath "$INSTDIR\sample"
+  File /r "${KFW_SAMPLE_DIR}\*"
+
   CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Developer Documentation.lnk" "$INSTDIR\bin\netiddev.chm" 
 
   Call KFWCommon.Install