summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvestre Ledru <sledru@mozilla.com>2015-11-18 13:40:16 +0100
committerSylvestre Ledru <sledru@mozilla.com>2015-11-18 13:40:16 +0100
commit50a22aeb5280fb05be646a6e4249ee7ed09e6f9c (patch)
tree96074edf9ff22f2f5466cf3cdb56431b3c81fd32
parente37f77751ca74ca213d79890dd89a6c6650361e8 (diff)
downloadnspr-hg-50a22aeb5280fb05be646a6e4249ee7ed09e6f9c.tar.gz
Set version number to 4.12 Beta
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--pr/include/prinit.h6
-rw-r--r--pr/tests/vercheck.c5
4 files changed, 8 insertions, 7 deletions
diff --git a/configure b/configure
index 1ea42308..37f5eef2 100755
--- a/configure
+++ b/configure
@@ -2488,7 +2488,7 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=11
+MOD_MINOR_VERSION=12
MOD_PATCH_VERSION=0
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
diff --git a/configure.in b/configure.in
index aff14c2f..7b7818ab 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl ========================================================
dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=11
+MOD_MINOR_VERSION=12
MOD_PATCH_VERSION=0
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index 93749e63..fa9a43e1 100644
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
-#define PR_VERSION "4.11"
+#define PR_VERSION "4.12 Beta"
#define PR_VMAJOR 4
-#define PR_VMINOR 11
+#define PR_VMINOR 12
#define PR_VPATCH 0
-#define PR_BETA PR_FALSE
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 2b4e6fba..229d24f6 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -22,7 +22,7 @@
/*
* This release (4.10.10) 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.x,
- * 4.8.x, 4.9.x, and 4.10.x releases.
+ * 4.8.x, 4.9.x, 4.10.x and 4.11.X releases.
* It, of course, is compatible with itself.
*/
static char *compatible_version[] = {
@@ -39,7 +39,7 @@ static char *compatible_version[] = {
"4.9.6",
"4.10", "4.10.1", "4.10.2", "4.10.3", "4.10.4",
"4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9",
- "4.10.10",
+ "4.10.10", "4.11",
PR_VERSION
};
@@ -57,6 +57,7 @@ static char *incompatible_version[] = {
"3.5", "3.5.1",
"4.11.1",
"4.12", "4.12.1",
+ "4.12.1",
"10.0", "11.1", "12.14.20"
};