Bug 510436: Add macro for build number (4th component of version number)
authorwtc%google.com
Fri, 11 Jun 2010 01:04:32 +0000
changeset 9668 d04fbe6a4cb4934600d826ac92838ff482a7d8a3
parent 9667 1cb080b104acf9163758331550d1801d5af5777e
child 9669 748f866dd529355697850a0e9c5af3cc13467a01
push idunknown
push userunknown
push dateunknown
bugs510436
Bug 510436: Add macro for build number (4th component of version number) to softkver.h. Set the Softoken version to 3.12.7.0 Beta. r=rrelyea. Modified Files: lib/freebl/freebl.rc lib/softoken/softkver.h lib/softoken/softokn.rc lib/softoken/legacydb/nssdbm.rc
security/nss/lib/freebl/freebl.rc
security/nss/lib/softoken/legacydb/nssdbm.rc
security/nss/lib/softoken/softkver.h
security/nss/lib/softoken/softokn.rc
--- a/security/nss/lib/freebl/freebl.rc
+++ b/security/nss/lib/freebl/freebl.rc
@@ -66,18 +66,18 @@
 #define MY_INTERNAL_NAME MY_LIBNAME SOFTOKEN_VMAJOR_STR
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version-information resource
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,0
- PRODUCTVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,0
+ FILEVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,SOFTOKEN_VBUILD
+ PRODUCTVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,SOFTOKEN_VBUILD
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
  FILEFLAGS MY_FILEFLAGS_2
  FILEOS MY_FILEOS
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L // not used
 
 BEGIN
     BLOCK "StringFileInfo"
--- a/security/nss/lib/softoken/legacydb/nssdbm.rc
+++ b/security/nss/lib/softoken/legacydb/nssdbm.rc
@@ -66,18 +66,18 @@
 #define MY_INTERNAL_NAME MY_LIBNAME SOFTOKEN_VMAJOR_STR
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version-information resource
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,0
- PRODUCTVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,0
+ FILEVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,SOFTOKEN_VBUILD
+ PRODUCTVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,SOFTOKEN_VBUILD
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
  FILEFLAGS MY_FILEFLAGS_2
  FILEOS MY_FILEOS
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L // not used
 
 BEGIN
     BLOCK "StringFileInfo"
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -46,21 +46,22 @@
 #else
 #define SOFTOKEN_ECC_STRING " Basic ECC"
 #endif
 #else
 #define SOFTOKEN_ECC_STRING ""
 #endif
 
 /*
- * Softoken's major version, minor version, patch level, and whether
- * this is a beta release.
+ * Softoken's major version, minor version, patch level, build number,
+ * and whether this is a beta release.
  *
  * The format of the version string should be
- *     "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
+ *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.12.4.6" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.12.7.0" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   12
-#define SOFTOKEN_VPATCH   4
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_VPATCH   7
+#define SOFTOKEN_VBUILD   0
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
--- a/security/nss/lib/softoken/softokn.rc
+++ b/security/nss/lib/softoken/softokn.rc
@@ -66,18 +66,18 @@
 #define MY_INTERNAL_NAME MY_LIBNAME SOFTOKEN_VMAJOR_STR
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version-information resource
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,0
- PRODUCTVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,0
+ FILEVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,SOFTOKEN_VBUILD
+ PRODUCTVERSION SOFTOKEN_VMAJOR,SOFTOKEN_VMINOR,SOFTOKEN_VPATCH,SOFTOKEN_VBUILD
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
  FILEFLAGS MY_FILEFLAGS_2
  FILEOS MY_FILEOS
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L // not used
 
 BEGIN
     BLOCK "StringFileInfo"