summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2008-05-02 19:09:54 +0000
committerwtc%google.com <devnull@localhost>2008-05-02 19:09:54 +0000
commit52c23024d7746786d0da3cab148d805b872d6e48 (patch)
tree912ca87f5e7269cba51ad56130fdaea0ed2641d6
parentc7a706e5e28c2b3f89ede72942ca0744a3cc4b2d (diff)
downloadnspr-hg-52c23024d7746786d0da3cab148d805b872d6e48.tar.gz
Set NSPR version to 4.7.2 Beta.
Modified files: configure configure.in repackage.sh prinit.h vercheck.c
-rwxr-xr-xadmin/repackage.sh8
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--pr/include/prinit.h6
-rw-r--r--pr/tests/vercheck.c13
5 files changed, 16 insertions, 15 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh
index 67942dab..bc219cce 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -64,10 +64,10 @@
#
# ------------------------------------------------------------------
-FROMTOP=/share/builds/components/nspr20/v4.7.1
-TOTOP=./v4.7.1
-NSPRDIR=nspr-4.7.1
-SOURCETAG=NSPR_4_7_1_RTM
+FROMTOP=/share/builds/components/nspr20/v4.7.2
+TOTOP=./v4.7.2
+NSPRDIR=nspr-4.7.2
+SOURCETAG=NSPR_4_7_2_RTM
#
# enumerate Unix object directories on /s/b/c
diff --git a/configure b/configure
index 4848916f..e7fdaae9 100755
--- a/configure
+++ b/configure
@@ -692,7 +692,7 @@ test "$host_alias" != "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=7
-MOD_PATCH_VERSION=1
+MOD_PATCH_VERSION=2
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/configure.in b/configure.in
index 55f88724..72dcb7eb 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,7 @@ dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=7
-MOD_PATCH_VERSION=1
+MOD_PATCH_VERSION=2
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index 5239e4fa..2373eb4e 100644
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
-#define PR_VERSION "4.7.1"
+#define PR_VERSION "4.7.2 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 7
-#define PR_VPATCH 1
-#define PR_BETA PR_FALSE
+#define PR_VPATCH 2
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index c47eb899..fa82cb12 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,16 +52,17 @@
#include <stdlib.h>
/*
- * This release (4.7) is backward compatible with the
- * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, and 4.6.x releases.
- * It, of course, is compatible with itself.
+ * This release (4.7.2) 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.x, 4.7, and
+ * 4.7.1 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", "4.6.6", "4.6.7", "4.6.8",
- "4.7", PR_VERSION
+ "4.6", "4.6.1", "4.6.2", "4.6.3", "4.6.4", "4.6.5",
+ "4.6.6", "4.6.7", "4.6.8",
+ "4.7", "4.7.1", PR_VERSION
};
/*
@@ -76,7 +77,7 @@ static char *incompatible_version[] = {
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
- "4.7.3",
+ "4.7.9",
"4.8", "4.8.1",
"10.0", "11.1", "12.14.20"
};