From 41927c3cbf068f71c2ef5f880f21a459477c62a0 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 3 Jul 2008 00:00:37 +0000
Subject: [PATCH] windows-config-version-20080702

LICENSE MIT

Add AFSPRODUCT_VERSION to the AFS_component_version_number.h files

Update copyright info and add underscores to version strings in rc files
---
 src/config/NTMakefile.i386_w2k      | 2 +-
 src/config/NTMakefile.version-NOCML | 9 +++++----
 src/config/NTVersioninfo.rc         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 45b3a29c2..2ee9b36f1 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -86,7 +86,7 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VER_MAJOR=2
+AFSPRODUCT_VER_MAJOR=0
 AFSPRODUCT_VER_MINOR=0
 AFSPRODUCT_VER_PATCH=0
 AFSPRODUCT_VER_BUILD=0
diff --git a/src/config/NTMakefile.version-NOCML b/src/config/NTMakefile.version-NOCML
index 6326574fe..9bebb977c 100644
--- a/src/config/NTMakefile.version-NOCML
+++ b/src/config/NTMakefile.version-NOCML
@@ -14,12 +14,13 @@ VERSFILE=AFS_component_version_number
 !ENDIF
 
 $(VERSFILE).c:
-	echo char $(CML_PREFIX)cml_version_number[]="@(#)OpenAFS$(AFSPRODUCT_VERSION)"; >$(VERSFILE).c
-	echo char* AFSVersion = "OpenAFS$(AFSPRODUCT_VERSION)";  >>$(VERSFILE).c
+	echo char $(CML_PREFIX)cml_version_number[]="@(#)OpenAFS_$(AFSPRODUCT_VERSION)"; >$(VERSFILE).c
+	echo char* AFSVersion = "OpenAFS_$(AFSPRODUCT_VERSION)";  >>$(VERSFILE).c
 
 $(VERSFILE).h:
-	echo #define AFS_VERINFO_BUILD "OpenAFS$(AFSPRODUCT_VERSION)" >$(VERSFILE).h
+	echo #define AFS_VERINFO_BUILD "OpenAFS_$(AFSPRODUCT_VERSION)" >$(VERSFILE).h
 	echo #define AFS_VERINFO_FILEVER $(AFSPRODUCT_FILE_VERSION) >>$(VERSFILE).h
+        echo #define AFSPRODUCT_VERSION "$(AFSPRODUCT_VERSION)" >> $(VERSFILE).h
 
 $(VERSFILE).txt:
-	echo OpenAFS$(AFSPRODUCT_VERSION)>$(VERSFILE).txt
+	echo OpenAFS_$(AFSPRODUCT_VERSION)>$(VERSFILE).txt
diff --git a/src/config/NTVersioninfo.rc b/src/config/NTVersioninfo.rc
index 569b0021c..920275003 100644
--- a/src/config/NTVersioninfo.rc
+++ b/src/config/NTVersioninfo.rc
@@ -27,7 +27,7 @@ BEGIN
         BLOCK "000004E4"
         BEGIN
             VALUE "CompanyName",        "OpenAFS Project", "\0"
-            VALUE "LegalCopyright",     "Copyright \251 IBM Corporation and others, 1998, 1999, 2000, 2001, 2002, 2003.", "\0"
+            VALUE "LegalCopyright",     "Copyright \251 IBM Corporation and many others, 1998-2008.", "\0"
             VALUE "ProductName",        "OpenAFS for Windows", "\0"
             VALUE "ProductVersion",     AFSPRODUCT_VERSION, "\0"
             VALUE "FileVersion",        AFSPRODUCT_VERSION, "\0"
-- 
2.39.5