Set NSPR version to 4.6.7 Beta. NSPR_4_6_BRANCH
authorwtc%google.com
Fri, 27 Apr 2007 20:01:02 +0000
branchNSPR_4_6_BRANCH
changeset 3819 e669ae3b2344a7f82d51e065281f96fc158812c3
parent 3817 0f623943b88a9a7b904f82cc6b0828e333cbf078
child 3820 ffb9b96d25e443f8cf17a6868c9204f807c5ea81
push idunknown
push userunknown
push dateunknown
Set NSPR version to 4.6.7 Beta. Modified Files: configure configure.in repackage.sh prinit.h vercheck.c Tag: NSPR_4_6_BRANCH
admin/repackage.sh
configure
configure.in
pr/include/prinit.h
pr/tests/vercheck.c
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -59,20 +59,20 @@
 # Note! Files written with Gnu tar are not readable by some non-Gnu
 # versions. Sun, in particular.
 # 
 # 
 # 
 # 
 # ------------------------------------------------------------------
 
-FROMTOP=/share/builds/components/nspr20/v4.6.6
-TOTOP=./v4.6.6
-NSPRDIR=nspr-4.6.6
-SOURCETAG=NSPR_4_6_6_RTM
+FROMTOP=/share/builds/components/nspr20/v4.6.7
+TOTOP=./v4.6.7
+NSPRDIR=nspr-4.6.7
+SOURCETAG=NSPR_4_6_7_RTM
 
 #
 # enumerate Unix object directories on /s/b/c
 UNIX_OBJDIRS="
 HP-UXB.11.11_64_DBG.OBJ
 HP-UXB.11.11_64_OPT.OBJ
 HP-UXB.11.11_DBG.OBJ
 HP-UXB.11.11_OPT.OBJ
--- a/configure
+++ b/configure
@@ -682,17 +682,17 @@ echo "$ac_t""$build" 1>&6
 test "$host_alias" != "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
 
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=6
+MOD_PATCH_VERSION=7
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
 USE_USER_PTHREADS=
 USE_NSPR_THREADS=
 USE_N32=
 USE_64=
 USE_CPLUS=
--- a/configure.in
+++ b/configure.in
@@ -45,17 +45,17 @@ AC_INIT(config/libc_r.h)
 AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
 AC_CANONICAL_SYSTEM
 
 dnl ========================================================
 dnl = Defaults
 dnl ========================================================
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=6
+MOD_PATCH_VERSION=7
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
 USE_USER_PTHREADS=
 USE_NSPR_THREADS=
 USE_N32=
 USE_64=
 USE_CPLUS=
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -58,21 +58,21 @@ PR_BEGIN_EXTERN_C
 /*
 ** NSPR's version is used to determine the likelihood that the version you
 ** used to build your component is anywhere close to being compatible with
 ** what is in the underlying library.
 **
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.6.6"
+#define PR_VERSION  "4.6.7 Beta"
 #define PR_VMAJOR   4
 #define PR_VMINOR   6
-#define PR_VPATCH   6
-#define PR_BETA     PR_FALSE
+#define PR_VPATCH   7
+#define PR_BETA     PR_TRUE
 
 /*
 ** PRVersionCheck
 **
 ** The basic signature of the function that is called to provide version
 ** checking. The result will be a boolean that indicates the likelihood
 ** that the underling library will perform as the caller expects.
 **
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -47,41 +47,41 @@
  */
 
 #include "prinit.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 /*
- * This release (4.6.6) is backward compatible with the
+ * This release (4.6.7) is backward compatible with the
  * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6, 4.6.1, 4.6.2,
- * 4.6.3, 4.6.4, and 4.6.5 releases.  It, of course, is compatible
- * with itself.
+ * 4.6.3, 4.6.4, 4.6.5, and 4.6.6 releases.  It, of course,
+ * is compatible with itself.
  */
 static char *compatible_version[] = {
     "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3",
     "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1",
     "4.5", "4.5.1", "4.6", "4.6.1", "4.6.2", "4.6.3",
-    "4.6.4", "4.6.5", PR_VERSION
+    "4.6.4", "4.6.5", "4.6.6", PR_VERSION
 };
 
 /*
  * This release is not backward compatible with the old
  * NSPR 2.1 and 3.x releases.
  *
  * Any release is incompatible with future releases and
  * patches.
  */
 static char *incompatible_version[] = {
     "2.1 19980529",
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2", "3.1.3",
     "3.5", "3.5.1",
-    "4.6.7",
+    "4.6.8",
     "4.7", "4.7.1",
     "10.0", "11.1", "12.14.20"
 };
 
 int main()
 {
     int idx;
     int num_compatible = sizeof(compatible_version) / sizeof(char *);