DEVEL15-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

(cherry picked from commit 41927c3cbf068f71c2ef5f880f21a459477c62a0)

diff --git a/src/config/NTMakefile.version-NOCML b/src/config/NTMakefile.version-NOCML
index 6326574fea495861edbb62053c54f9b9e1af393c..9bebb977c7f1f4deef7263931cb17f08b7dae0ba 100644 (file)
--- 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 569b0021c49fcd514bd478d67cb0d14be3b2ce83..92027500300a11c688042a64ec3fa2ac6c96ce86 100644 (file)
--- 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"