bug 502033 - Set up 2.1a1pre version number for c-c+m-c SeaMonkey builds; r=Standard8, r=Fallen for calendar, sr=Neil
authorRobert Kaiser <kairo@kairo.at>
Fri, 03 Jul 2009 16:52:09 +0200
changeset 3006 104e9a46963472da86393023c69c01fd6a471db7
parent 3005 9441142c94d4cdde86b13f04403eccaa292d8766
child 3007 359809aeec067c5a6fe4b4bae8f8d81014748e09
push idunknown
push userunknown
push dateunknown
reviewersStandard8, Fallen, Neil
bugs502033
bug 502033 - Set up 2.1a1pre version number for c-c+m-c SeaMonkey builds; r=Standard8, r=Fallen for calendar, sr=Neil
calendar/lightning/Makefile.in
calendar/timezones/Makefile.in
suite/config/version-191.txt
suite/config/version.txt
suite/confvars.sh
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -54,17 +54,21 @@ 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)
 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
 ifdef LIGHTNING_FIREFOX
 FIREFOX_VERSION := $(shell cat $(MOZILLA_SRCDIR)/browser/config/version.txt)
 endif
 
 ifneq (,$(findstring pre,$(LIGHTNING_VERSION)))
 DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
 endif
 
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -76,17 +76,21 @@ ifndef DISABLE_LIGHTNING_INSTALL
 INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
 endif
 
 ifdef MOZILLA_1_9_1_BRANCH
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-191.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
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 TIMEZONES_VERSION := $(shell cat $(srcdir)/config/version.txt)
 
 DEFINES += -DAB_CD=$(AB_CD) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DTIMEZONES_VERSION=$(TIMEZONES_VERSION) \
copy from suite/config/version.txt
copy to suite/config/version-191.txt
--- a/suite/config/version.txt
+++ b/suite/config/version.txt
@@ -1,1 +1,1 @@
-2.0b1pre
\ No newline at end of file
+2.1a1pre
\ No newline at end of file
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -40,15 +40,19 @@ MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
-MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version.txt`
+if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
+  MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version-191.txt`
+else
+  MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/config/version.txt`
+fi
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs reporter"
 MOZ_PLACES=1
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1