Pull up r17544 from trunk

ticket: 3271
version_fixed: 1.4.4

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

diff --git a/src/windows/installer/nsis/KfWConfigPage2.ini b/src/windows/installer/nsis/KfWConfigPage2.ini
index ffa3d78d7a68260884c64b69ec50f37f1f989f42..60c3bfc437d6b612131ef22ea4387e1b5fcf8028 100644 (file)
--- a/src/windows/installer/nsis/KfWConfigPage2.ini
+++ b/src/windows/installer/nsis/KfWConfigPage2.ini
@@ -18,11 +18,3 @@ Right=-1
 Top=25
 Bottom=35
 
-[Field 3]
-Type=CheckBox
-Text=Ensure that Kerberos tickets are available throughout the Windows logon session [-autoinit].
-State=1
-Left=10
-Right=-1
-Top=40
-Bottom=60

diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi
index 20106a722c53e846f0d8b2f3dccf4e784a490606..f812e732635b3743267959bdb4f0e29a7bd3e7a7 100644 (file)
--- a/src/windows/installer/nsis/kfw-fixed.nsi
+++ b/src/windows/installer/nsis/kfw-fixed.nsi
@@ -386,20 +386,11 @@ Section "KfW Client" secClient
   CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Uninstall ${PROGRAM_NAME}.lnk" "$INSTDIR\Uninstall.exe"
 
   ReadINIStr $R0 $1 "Field 2" "State"  ; startup
-  ReadINIStr $R1 $1 "Field 3" "State"  ; autoinit
 
-  StrCmp $R1 "0" noauto
-  CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager.lnk" "$INSTDIR\bin\netidmgr.exe" "--autoinit" "$INSTDIR\bin\netidmgr.exe" 
-  goto startshort
-noauto:
   CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager.lnk" "$INSTDIR\bin\netidmgr.exe" "" "$INSTDIR\bin\netidmgr.exe" 
 
 startshort:
   StrCmp $R0 "0" nostart
-  StrCmp $R1 "0" nostartauto
-  CreateShortCut  "$SMSTARTUP\Network Identity Manager.lnk" "$INSTDIR\bin\netidmgr.exe" "--autoinit" "$INSTDIR\bin\netidmgr.exe" 0 SW_SHOWMINIMIZED
-  goto checkconflicts
-nostartauto:  
   CreateShortCut  "$SMSTARTUP\Network Identity Manager.lnk" "$INSTDIR\bin\netidmgr.exe" "" "$INSTDIR\bin\netidmgr.exe" 0 SW_SHOWMINIMIZED
   goto checkconflicts
 
@@ -539,6 +530,9 @@ Section "KfW SDK" secSDK
   RMDir /r "$INSTDIR\lib"
   RMDir /r "$INSTDIR\install"
 
+  SetOutPath "$INSTDIR\doc"
+  File /r "${KFW_DOC_DIR}\netiddev.chm"
+
   SetOutPath "$INSTDIR\inc\kclient"
   File /r "${KFW_INC_DIR}\kclient\*"  
 
@@ -569,6 +563,8 @@ Section "KfW SDK" secSDK
   SetOutPath "$INSTDIR\install"
   File /r "${KFW_INSTALL_DIR}\*"
 
+  CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Developer Documentation.lnk" "$INSTDIR\bin\netiddev.chm" 
+
   Call KFWCommon.Install
   
   ; KfW Reg entries
@@ -603,7 +599,7 @@ Section "KfW Documentation" secDocs
 
   SetOutPath "$INSTDIR\doc"
   File "${KFW_DOC_DIR}\relnotes.html"
-;  File "${KFW_DOC_DIR}\leash_userdoc.pdf"
+  File "${KFW_DOC_DIR}\netidmgr_userdoc.pdf"
    
   Call KFWCommon.Install
   
@@ -633,7 +629,7 @@ Section "KfW Documentation" secDocs
   CreateDirectory "$SMPROGRAMS\${PROGRAM_NAME}"
   SetOutPath "$INSTDIR\doc"
   CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Release Notes.lnk" "$INSTDIR\doc\relnotes.html" 
-;  CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager User Documentation.lnk" "$INSTDIR\doc\netidmgr_userdoc.pdf" 
+  CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager User Documentation.lnk" "$INSTDIR\doc\netidmgr_userdoc.pdf" 
   CreateShortCut  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager Documentation.lnk" "$INSTDIR\bin\netidmgr.chm" 
 SectionEnd
 
@@ -1125,8 +1121,9 @@ StartRemove:
   
   ; Delete documentation
   Delete "$INSTDIR\doc\relnotes.html"
-;  Delete "$INSTDIR\doc\leash_userdoc.pdf"
-
+  Delete "$INSTDIR\doc\netidmgr_userdoc.pdf"
+  Delete "$INSTDIR\doc\netiddev.chm"
+ 
 !ifdef AKLOG
    Delete /REBOOTOK "$INSTDIR\bin\aklog.exe"
 !endif
@@ -1297,6 +1294,7 @@ StartRemove:
   Delete  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager.lnk"
   Delete  "$SMPROGRAMS\${PROGRAM_NAME}\Release Notes.lnk"
   Delete  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Manager User Documentation.lnk"
+  Delete  "$SMPROGRAMS\${PROGRAM_NAME}\Network Identity Developer Documentation.lnk"
   RmDir   "$SMPROGRAMS\${PROGRAM_NAME}"
   Delete  "$SMSTARTUP\Network Identity Manager.lnk"
 

diff --git a/src/windows/installer/nsis/site-local.nsi b/src/windows/installer/nsis/site-local.nsi
index 4cb27083d4062f2492ce1a6cf7f90ff9392fd3e2..62b9b0af158671766eea64cd7f2f445f7a6191ee 100644 (file)
--- a/src/windows/installer/nsis/site-local.nsi
+++ b/src/windows/installer/nsis/site-local.nsi
@@ -1,13 +1,13 @@
-!define KFW_TARGETDIR c:\temp\kfw\kfw-3.0.0-beta-2
+!define KFW_TARGETDIR c:\temp\kfw\kfw-3.0.0
 !define KFW_CONFIG_DIR "c:\temp\kfw\kfw-2.5-extra\sample-config"
 !define KFW_MAJORVERSION 3
 !define KFW_MINORVERSION 0
 !define KFW_PATCHLEVEL 0
 !define CL_1310
 
-!define NOT_RELEASE
-!define DEBUG
-!define BETA 2
+!define RELEASE
+!define NOT_DEBUG
+!define NOT_BETA
 !define SAMPLE_CONFIG_REALM "ATHENA.MIT.EDU"
 !define HTTP_CONFIG_URL     "[Obtain a URL from your Kerberos administrator]"