summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2008-11-08 00:55:26 +0000
committerwtc%google.com <devnull@localhost>2008-11-08 00:55:26 +0000
commit8955c3f403993ed3d29f3545b0bf657adb70ed52 (patch)
treea1e35464a617922cc591533ea1091f1b6879ef38
parent56039c86e7b567b20bdbd968db9a3664bc12cdcf (diff)
downloadnspr-hg-8955c3f403993ed3d29f3545b0bf657adb70ed52.tar.gz
Set NSPR version to 4.7.4 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.c9
5 files changed, 14 insertions, 13 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh
index 74e4e65a..187279ef 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -64,10 +64,10 @@
#
# ------------------------------------------------------------------
-FROMTOP=/share/builds/components/nspr20/v4.7.3
-TOTOP=./v4.7.3
-NSPRDIR=nspr-4.7.3
-SOURCETAG=NSPR_4_7_3_RTM
+FROMTOP=/share/builds/components/nspr20/v4.7.4
+TOTOP=./v4.7.4
+NSPRDIR=nspr-4.7.4
+SOURCETAG=NSPR_4_7_4_RTM
#
# enumerate Unix object directories on /s/b/c
diff --git a/configure b/configure
index dca94413..1a0cfa73 100755
--- a/configure
+++ b/configure
@@ -689,7 +689,7 @@ test "$host_alias" != "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=7
-MOD_PATCH_VERSION=3
+MOD_PATCH_VERSION=4
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/configure.in b/configure.in
index 7a3ff907..bd3fc97c 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=3
+MOD_PATCH_VERSION=4
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index 10dbd877..091900a2 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.3"
+#define PR_VERSION "4.7.4 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 7
-#define PR_VPATCH 3
-#define PR_BETA PR_FALSE
+#define PR_VPATCH 4
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 843ec0c7..488ee574 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,9 +52,10 @@
#include <stdlib.h>
/*
- * This release (4.7.3) 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, 4.7.1,
- * and 4.7.2 releases. It, of course, is compatible with itself.
+ * This release (4.7.4) 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,
+ * 4.7.1, 4.7.2, and 4.7.3 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",
@@ -62,7 +63,7 @@ static char *compatible_version[] = {
"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", "4.7.1", "4.7.2", PR_VERSION
+ "4.7", "4.7.1", "4.7.2", "4.7.3", PR_VERSION
};
/*