Update build files for new version and file locations

Target_Version: 1.6.1
Tags:  pullup

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

diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi
index c61f5a18ce543bec985c061f11bd6e890e94fab7..80b70803ae333a58cf1594d836613d609578e197 100644 (file)
--- a/src/windows/installer/nsis/kfw-fixed.nsi
+++ b/src/windows/installer/nsis/kfw-fixed.nsi
@@ -146,9 +146,9 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug"
    LangString REINSTALL_DOCS ${LANG_ENGLISH} "Re-install Kerberos Documentation"
    LangString DOWNGRADE_DOCS ${LANG_ENGLISH} "Downgrade Kerberos Documentation"
   
-  ReserveFile "${KFW_CONFIG_DIR}\krb.con"
-  ReserveFile "${KFW_CONFIG_DIR}\krbrealm.con"
-  ReserveFile "${KFW_CONFIG_DIR}\krb5.ini"
+  ReserveFile "${KFW_CONFIG_DIR}\sample\krb.con"
+  ReserveFile "${KFW_CONFIG_DIR}\sample\krbrealm.con"
+  ReserveFile "${KFW_CONFIG_DIR}\sample\krb5.ini"
   !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ;InstallOptions plug-in
   !insertmacro MUI_RESERVEFILE_LANGDLL ;Language selection dialog
 
@@ -188,9 +188,6 @@ Section "KfW Client" secClient
 
    ; Do client components
   SetOutPath "$INSTDIR\bin"
-!ifdef AKLOG
-  !insertmacro ReplaceDLL "${KFW_BIN_DIR}\aklog.exe"           "$INSTDIR\bin\aklog.exe"         "$INSTDIR"
-!endif
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\comerr32.dll"        "$INSTDIR\bin\comerr32.dll"      "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss.exe"             "$INSTDIR\bin\gss.exe"           "$INSTDIR"
   !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss-client.exe"      "$INSTDIR\bin\gss-client.exe"    "$INSTDIR"
@@ -1424,9 +1421,9 @@ DoDownload:
 
 UsePackaged:
    SetOutPath "$WINDIR"
-   File "${KFW_CONFIG_DIR}\krb5.ini"
-   File "${KFW_CONFIG_DIR}\krb.con"
-   File "${KFW_CONFIG_DIR}\krbrealm.con"
+   File "${KFW_CONFIG_DIR}\sample\krb5.ini"
+   File "${KFW_CONFIG_DIR}\sample\krb.con"
+   File "${KFW_CONFIG_DIR}\sample\krbrealm.con"
    goto done
    
 CheckOther:

diff --git a/src/windows/installer/nsis/nsi-includes.nsi b/src/windows/installer/nsis/nsi-includes.nsi
index bc1c4c78e85998dec3a29554406dd5996d6b0c89..667cb8d4716c62443f4296681cf09666d6257510 100644 (file)
--- 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-3.1.0-alpha
-!define KFW_EXTRADIR  c:\temp\kfw\kfw-2.5-extra
-!define KFW_VERSION 3.1
+!define KFW_TARGETDIR c:\projects\autobuild\pismere\target
+!define KFW_EXTRADIR "c:\projects\autobuild\pismere\target"
+!define KFW_VERSION 3.2
 !define KFW_MAJORVERSION 3
-!define KFW_MINORVERSION 1
+!define KFW_MINORVERSION 2
 !define KFW_PATCHLEVEL 0000
 !define CL_1310
 

diff --git a/src/windows/installer/nsis/site-local.nsi b/src/windows/installer/nsis/site-local.nsi
index 13e5dce8e39adbff97e3a682ca6de7af894d47ad..15c862010c81122684647214f77613dbe6660916 100644 (file)
--- a/src/windows/installer/nsis/site-local.nsi
+++ b/src/windows/installer/nsis/site-local.nsi
@@ -1,7 +1,7 @@
-!define KFW_TARGETDIR c:\temp\kfw\kfw-3.1.0-alpha
-!define KFW_CONFIG_DIR "c:\temp\kfw\kfw-2.5-extra\sample-config"
+!define KFW_TARGETDIR c:\projects\autobuild\pismere\staging
+!define KFW_CONFIG_DIR "c:\projects\autobuild\pismere\staging"
 !define KFW_MAJORVERSION 3
-!define KFW_MINORVERSION 1
+!define KFW_MINORVERSION 2
 !define KFW_PATCHLEVEL 0
 !define CL_1310