Bug 535206 Set up version numbers for the comm-central and mozilla-1.9.2 branch. r=philringnalda,Fallen
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 30 Dec 2009 20:53:28 +0000
changeset 4607 6dbfee73fb5048ae6e2497140edaa7e704fa4d3b
parent 4606 a2a524e80244a0923523cd06f086f9a31b32f838
child 4608 5c49bdbb49223881848e190f4f6d61e16af2df74
push idunknown
push userunknown
push dateunknown
reviewersphilringnalda, Fallen
bugs535206
Bug 535206 Set up version numbers for the comm-central and mozilla-1.9.2 branch. r=philringnalda,Fallen
calendar/lightning/Makefile.in
calendar/providers/gdata/Makefile.in
calendar/timezones/Makefile.in
mail/config/version-191.txt
mail/config/version-192.txt
mail/config/version.txt
mail/confvars.sh
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -49,18 +49,18 @@ MODULE		= lightning
 export XPI_NAME = lightning
 export USE_EXTENSION_MANIFEST = 1
 XPI_PKGNAME = lightning
 
 STRIP_XPI = 1
 DIST_FILES = install.rdf
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
-ifdef MOZILLA_1_9_1_BRANCH
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-191.txt)
+ifdef MOZILLA_1_9_2_BRANCH
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
 ifdef MOZILLA_1_9_1_BRANCH
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
 else
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -45,21 +45,24 @@ MODULE = gdata-provider
 
 export USE_EXTENSION_MANIFEST = 1
 export XPI_NAME = gdata-provider
 DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider
 STRIP_XPI = 1
 
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
+ifdef MOZILLA_1_9_2_BRANCH
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
+else
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
+endif
 ifdef MOZILLA_1_9_1_BRANCH
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-191.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
 else
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
 DEFINES += -DAB_CD=$(AB_CD) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DCOMM_BUILD=$(COMM_BUILD) \
            $(NULL)
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -71,18 +71,18 @@ STRIP_XPI = 1
 PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
 DIRS = locales
 
 ifndef DISABLE_LIGHTNING_INSTALL
 # install as a global extension in dist/bin/extensions/
 INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
 endif
 
-ifdef MOZILLA_1_9_1_BRANCH
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-191.txt)
+ifdef MOZILLA_1_9_2_BRANCH
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
 ifdef MOZILLA_1_9_1_BRANCH
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
 else
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
deleted file mode 100644
--- a/mail/config/version-191.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-3.0pre
new file mode 100644
--- /dev/null
+++ b/mail/config/version-192.txt
@@ -0,0 +1,1 @@
+3.1a1pre
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-3.1a1pre
+3.2a1pre
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -49,21 +49,23 @@ MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 
 # Needed for the mozilla-central build side of the system.
-# Can be dropped when we branch MOZILLA_1_9_1_BRANCH
+# Can be dropped when we branch MOZILLA_1_9_2_BRANCH
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
 
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
-  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version-191.txt
+if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
+  # Use unofficial branding for the 1.9.2 branch
+  MOZ_BRANDING_DIRECTORY=mail/branding/unofficial
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version-192.txt
 else
   MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/config/version.txt
 fi
 
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_NO_XPCOM_OBSOLETE=1