Windows: NSIS updates for 2.18 release

This commit corrects errors in the NSIS installer scripts
that prevent installer builds using NSIS 2.18.

ticket: new

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

diff --git a/src/windows/installer/nsis/licenses.rtf b/src/windows/installer/nsis/licenses.rtf
index 1ddfcb96def19fbaeba42bd3e48b130164962df0..91dd9070e2e51549b2a2c46e82d0f3e7ec708567 100644 (file)
--- a/src/windows/installer/nsis/licenses.rtf
+++ b/src/windows/installer/nsis/licenses.rtf
@@ -2,7 +2,7 @@
 {\*\generator Msftedit 5.41.15.1503;}\viewkind4\uc1\pard\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f0\fs20 Copyright Notice and Legal Administrivia\par
 ----------------------------------------\par
 \par
-Copyright (C) 1985-2005 by the Massachusetts Institute of Technology.\par
+Copyright (C) 1985-2006 by the Massachusetts Institute of Technology.\par
 \par
 All rights reserved.\par
 \par

diff --git a/src/windows/installer/nsis/nsi-includes.nsi b/src/windows/installer/nsis/nsi-includes.nsi
index 275237ae4f85119b0a03c15591d735e88966556f..bc1c4c78e85998dec3a29554406dd5996d6b0c89 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.0.0-beta-1
+!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.0
+!define KFW_VERSION 3.1
 !define KFW_MAJORVERSION 3
-!define KFW_MINORVERSION 0
+!define KFW_MINORVERSION 1
 !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 62b9b0af158671766eea64cd7f2f445f7a6191ee..13e5dce8e39adbff97e3a682ca6de7af894d47ad 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
+!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_MAJORVERSION 3
-!define KFW_MINORVERSION 0
+!define KFW_MINORVERSION 1
 !define KFW_PATCHLEVEL 0
 !define CL_1310
 
 !define RELEASE
 !define NOT_DEBUG
-!define NOT_BETA
+!define BETA 1
 !define SAMPLE_CONFIG_REALM "ATHENA.MIT.EDU"
 !define HTTP_CONFIG_URL     "[Obtain a URL from your Kerberos administrator]"
 

diff --git a/src/windows/installer/nsis/utils.nsi b/src/windows/installer/nsis/utils.nsi
index 147f80482c582b67754040d5aa16a54b61da4648..e9f98c04edf73c64d3b8ec67f81676eca6c632c3 100644 (file)
--- a/src/windows/installer/nsis/utils.nsi
+++ b/src/windows/installer/nsis/utils.nsi
@@ -282,23 +282,23 @@ Function AddToSystemPath
   Push "$0;"
   Call StrStr
   Pop $2
-  StrCmp $2 "" "" AddToPath_done
+  StrCmp $2 "" 0 AddToPath_done
   Push "$1;"
   Push "$0\;"
   Call StrStr
   Pop $2
-  StrCmp $2 "" "" AddToPath_done
+  StrCmp $2 "" 0 AddToPath_done
   GetFullPathName /SHORT $3 $0
   Push "$1;"
   Push "$3;"
   Call StrStr
   Pop $2
-  StrCmp $2 "" "" AddToPath_done
+  StrCmp $2 "" 0 AddToPath_done
   Push "$1;"
   Push "$3\;"
   Call StrStr
   Pop $2
-  StrCmp $2 "" "" AddToPath_done
+  StrCmp $2 "" 0 AddToPath_done
 
   Call IsNT
   Pop $1