diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2007-03-16 03:55:52 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2007-03-16 03:55:52 +0000 |
| commit | 3f34b2d7b023aff6deb1a47cc1aa5fb8e3331756 (patch) | |
| tree | 048e119b0e0df38f7ba818aca5f31796ad31fa79 /src | |
| parent | 8a7f107df48ec9274a280c1d9de587b2002b134d (diff) | |
| download | krb5-3f34b2d7b023aff6deb1a47cc1aa5fb8e3331756.tar.gz krb5-3f34b2d7b023aff6deb1a47cc1aa5fb8e3331756.tar.xz krb5-3f34b2d7b023aff6deb1a47cc1aa5fb8e3331756.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows/installer/nsis/kfw-fixed.nsi | 15 | ||||
| -rw-r--r-- | src/windows/installer/nsis/nsi-includes.nsi | 8 | ||||
| -rw-r--r-- | src/windows/installer/nsis/site-local.nsi | 6 |
3 files changed, 13 insertions, 16 deletions
diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi index c61f5a18ce..80b70803ae 100644 --- 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 bc1c4c78e8..667cb8d471 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-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 13e5dce8e3..15c862010c 100644 --- 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 |