pull up r17735 from trunk

 r17735@cathode-dark-space:  jaltman | 2006-03-13 12:02:13 -0500
 ticket: new

   add new file windows/winlevel.h and update windows/version.rc
   to allow for a configurable KRB5_BUILDLEVEL.  This will be used
   to distinguish binary files from the same version 1.4.3 but
   different releases (alpha-1, alpha-2, beta-1, beta-2, final)

ticket: 3521

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

diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog
index d2fcb8fa24b6b79d81b745b7ebb9286ee4e3f2c0..1882a89879f65972a71fae30c236d4b5ac81b61b 100644 (file)
--- a/src/windows/ChangeLog
+++ b/src/windows/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-13  Jeffrey Altman <jaltman@mit.edu>
+
+       * winlevel.h (new file), version.rc:  Add configurable
+          KRB5_BUILDLEVEL for use on Windows.  Update copyright
+          dates to include 2006.
+
 2005-11-29  Jeffrey Altman <jaltman@mit.edu>
 
        * Makefile.in: build src/windows/kfwlogon

diff --git a/src/windows/version.rc b/src/windows/version.rc
index 05dba755d69fdf56df7ed94be231e68c5d90af0d..3f5b1af6f6c3750bcd70f50f02c2bd9ffa0b759f 100644 (file)
--- a/src/windows/version.rc
+++ b/src/windows/version.rc
@@ -1,6 +1,7 @@
 #include <windows.h>
 #include <winver.h>
 #include "patchlevel.h"
+#include "winlevel.h"
 
 /*
  * BEGIN COMMON VERSION INFO for GSS and Kerberos version resources
@@ -38,9 +39,9 @@
 /* we're going to stamp all the DLLs with the same version number */
 
 #define K5_PRODUCT_VERSION_STRING MAJOR_MINOR MAYBE_PATCH RELTAIL "\0"
-#define K5_PRODUCT_VERSION        KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, 0
+#define K5_PRODUCT_VERSION        KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, KRB5_BUILDLEVEL
 
-#define K5_COPYRIGHT "Copyright (C) 1997-2004 by the Massachusetts Institute of Technology\0"
+#define K5_COPYRIGHT "Copyright (C) 1997-2006 by the Massachusetts Institute of Technology\0"
 #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0"
 
 /* 

diff --git a/src/windows/winlevel.h b/src/windows/winlevel.h
new file mode 100644 (file)
index 0000000..c7af75c
--- /dev/null
+++ b/src/windows/winlevel.h
@@ -0,0 +1,33 @@
+/*\r
+ * winlevel.h\r
+ *\r
+ * Copyright (C) 2006 by the Massachusetts Institute of Technology.\r
+ * All rights reserved.\r
+ *\r
+ * Export of this software from the United States of America may\r
+ *   require a specific license from the United States Government.\r
+ *   It is the responsibility of any person or organization contemplating\r
+ *   export to obtain such a license before exporting.\r
+ *\r
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and\r
+ * distribute this software and its documentation for any purpose and\r
+ * without fee is hereby granted, provided that the above copyright\r
+ * notice appear in all copies and that both that copyright notice and\r
+ * this permission notice appear in supporting documentation, and that\r
+ * the name of M.I.T. not be used in advertising or publicity pertaining\r
+ * to distribution of the software without specific, written prior\r
+ * permission.  Furthermore if you modify this software you must label\r
+ * your software as modified software and not distribute it in such a\r
+ * fashion that it might be confused with the original M.I.T. software.\r
+ * M.I.T. makes no representations about the suitability of\r
+ * this software for any purpose.  It is provided "as is" without express\r
+ * or implied warranty.\r
+ */\r
+\r
+/*\r
+ * This is the slave file for Windows version stamping purposes. \r
+/* This value should be an ever increasing number that is \r
+ * updated for each alpha, beta, final release.   This will ensure\r
+ * that file identifiers are unique\r
+ */ \r
+#define KRB5_BUILDLEVEL                0\r