From 4decf1e6aa06ded9c1489a765975481515df597e Mon Sep 17 00:00:00 2001 From: "christophe.ravel.bugs%sun.com" Date: Fri, 7 Jan 2011 23:50:10 +0000 Subject: [PATCH] Change NSPR version to 4.8.8 Beta. git-svn-id: svn://10.0.0.236/trunk@261730 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/admin/repackage.sh | 8 ++++---- mozilla/nsprpub/configure | 2 +- mozilla/nsprpub/configure.in | 2 +- mozilla/nsprpub/pr/include/prinit.h | 6 +++--- mozilla/nsprpub/pr/tests/vercheck.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/nsprpub/admin/repackage.sh b/mozilla/nsprpub/admin/repackage.sh index dbbe2a108f5..ba9f5829776 100755 --- a/mozilla/nsprpub/admin/repackage.sh +++ b/mozilla/nsprpub/admin/repackage.sh @@ -64,10 +64,10 @@ # # ------------------------------------------------------------------ -FROMTOP=/share/builds/components/nspr20/v4.8.7 -TOTOP=./v4.8.7 -NSPRDIR=nspr-4.8.7 -SOURCETAG=NSPR_4_8_7_RTM +FROMTOP=/share/builds/components/nspr20/v4.8.8 +TOTOP=./v4.8.8 +NSPRDIR=nspr-4.8.8 +SOURCETAG=NSPR_4_8_8_RTM # # enumerate Unix object directories on /s/b/c diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure index 5ac69eb06ec..6635c48a057 100755 --- a/mozilla/nsprpub/configure +++ b/mozilla/nsprpub/configure @@ -713,7 +713,7 @@ test "$host_alias" != "$target_alias" && MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=8 -MOD_PATCH_VERSION=7 +MOD_PATCH_VERSION=8 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in index e8171b8d5f8..30b18120195 100644 --- a/mozilla/nsprpub/configure.in +++ b/mozilla/nsprpub/configure.in @@ -50,7 +50,7 @@ dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=8 -MOD_PATCH_VERSION=7 +MOD_PATCH_VERSION=8 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/mozilla/nsprpub/pr/include/prinit.h b/mozilla/nsprpub/pr/include/prinit.h index b3fc1732295..cc50dc6eb6f 100644 --- a/mozilla/nsprpub/pr/include/prinit.h +++ b/mozilla/nsprpub/pr/include/prinit.h @@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** ".[.] []" */ -#define PR_VERSION "4.8.7" +#define PR_VERSION "4.8.8 Beta" #define PR_VMAJOR 4 #define PR_VMINOR 8 -#define PR_VPATCH 7 -#define PR_BETA PR_FALSE +#define PR_VPATCH 8 +#define PR_BETA PR_TRUE /* ** PRVersionCheck diff --git a/mozilla/nsprpub/pr/tests/vercheck.c b/mozilla/nsprpub/pr/tests/vercheck.c index 090ae24eea7..6569c793e24 100644 --- a/mozilla/nsprpub/pr/tests/vercheck.c +++ b/mozilla/nsprpub/pr/tests/vercheck.c @@ -52,9 +52,9 @@ #include /* - * This release (4.8.7) is backward compatible with the + * This release (4.8.8) 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, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, and 4.8.6 releases. + * 4.8, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, 4.8.6 and 4.8.7 releases. * It, of course, is compatible with itself. */ static char *compatible_version[] = { @@ -66,7 +66,7 @@ static char *compatible_version[] = { "4.7", "4.7.1", "4.7.2", "4.7.3", "4.7.4", "4.7.5", "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", - "4.8.6", PR_VERSION + "4.8.6", "4.8.7", PR_VERSION }; /*