From 16c78b86c5b0ec9410202a8bd66958752c64c589 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 21 Jul 2006 23:24:08 +0000 Subject: [PATCH] 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 --- src/windows/ChangeLog | 6 ++++++ src/windows/version.rc | 5 +++-- src/windows/winlevel.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/windows/winlevel.h diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog index d2fcb8fa2..1882a8987 100644 --- a/src/windows/ChangeLog +++ b/src/windows/ChangeLog @@ -1,3 +1,9 @@ +2006-03-13 Jeffrey Altman + + * 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 * Makefile.in: build src/windows/kfwlogon diff --git a/src/windows/version.rc b/src/windows/version.rc index 05dba755d..3f5b1af6f 100644 --- a/src/windows/version.rc +++ b/src/windows/version.rc @@ -1,6 +1,7 @@ #include #include #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 index 000000000..c7af75c03 --- /dev/null +++ b/src/windows/winlevel.h @@ -0,0 +1,33 @@ +/* + * winlevel.h + * + * Copyright (C) 2006 by the Massachusetts Institute of Technology. + * All rights reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + */ + +/* + * This is the slave file for Windows version stamping purposes. +/* This value should be an ever increasing number that is + * updated for each alpha, beta, final release. This will ensure + * that file identifiers are unique + */ +#define KRB5_BUILDLEVEL 0 -- 2.26.2