Bug 543359 - Adjust Lightning version and required Thunderbird version for mozilla-1.9.2/mozilla-central [r=philipp]
authorStefan Sitter <ssitter@gmail.com>
Wed, 03 Feb 2010 22:24:57 +0100
changeset 4825 628163c4ab3dd2b983d04828ac5951977c44c104
parent 4824 544cf79ddf8caf35ec8a08f7f2e33e5a08a619cb
child 4826 0efafd067b9c06770f72fae713da01d039419dab
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs543359
Bug 543359 - Adjust Lightning version and required Thunderbird version for mozilla-1.9.2/mozilla-central [r=philipp]
calendar/confvars.sh
calendar/lightning/Makefile.in
calendar/lightning/install.rdf
calendar/providers/gdata/Makefile.in
calendar/sunbird/config/version-192.txt
calendar/timezones/Makefile.in
calendar/timezones/install.rdf
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -51,14 +51,26 @@ MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_INSTALLER=
 MOZ_MATHML=
 # MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
 MOZ_OJI=
 NECKO_COOKIES=
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=
 MOZ_UNIVERSALCHARDET=
-MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt`
+
+# Needed for the mozilla-central build side of the system.
+# 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.2"; then
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/sunbird/config/version-192.txt
+else
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt
+fi
+
+MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
+
 SUNBIRD_VERSION=$MOZ_APP_VERSION
 
 # Until we can build with libxul, we can't have ipc either
 MOZ_ENABLE_LIBXUL=
 MOZ_IPC=
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -48,20 +48,21 @@ 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_2_BRANCH
+LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
+LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 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
--- a/calendar/lightning/install.rdf
+++ b/calendar/lightning/install.rdf
@@ -6,17 +6,21 @@
 
   <Description about="urn:mozilla:install-manifest">
     <!-- Target Application this extension can install into, 
         with minimum and maximum supported versions. --> 
     <em:targetApplication>
       <Description>
         <!-- thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+#ifdef MOZILLA_1_9_2_BRANCH
         <em:minVersion>3.1a1pre</em:minVersion>
+#else
+        <em:minVersion>3.2a1pre</em:minVersion>
+#endif
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
 #if LIGHTNING_FIREFOX
     <!-- We only allow installation of Lightning into Firefox for ease of
        - development. You can edit the JS and then click reload in Firefox as
        - opposed to having to restart Thunderbird after each edit. -->
@@ -44,17 +48,17 @@
     <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
     <em:description>An integrated calendar for Thunderbird</em:description>
 #ifdef LIGHTNING_PRERELEASE_VERSION
     <em:developer>Build ID: @GRE_BUILDID@</em:developer>
 #endif
     <em:creator>Mozilla Calendar Project</em:creator>
     <em:homepageURL>http://www.mozilla.org/projects/calendar/releases/lightning@LIGHTNING_VERSION@.html</em:homepageURL>
 #ifdef MOZ_LANGPACK_CREATOR
-	  <em:translator>@MOZ_LANGPACK_CREATOR@</em:translator>
+    <em:translator>@MOZ_LANGPACK_CREATOR@</em:translator>
 #endif
 #ifdef MOZ_LANGPACK_CONTRIBUTORS
     @MOZ_LANGPACK_CONTRIBUTORS@
 #endif
     <em:iconURL>chrome://calendar/skin/cal-icon32.png</em:iconURL>
     <em:optionsURL>chrome://messenger/content/preferences/preferences.xul</em:optionsURL>
     <em:targetPlatform>@TARGET_PLATFORM@</em:targetPlatform>
   </Description>
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -44,20 +44,21 @@ include $(DEPTH)/config/autoconf.mk
 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
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 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
 DEFINES += -DAB_CD=$(AB_CD) \
new file mode 100644
--- /dev/null
+++ b/calendar/sunbird/config/version-192.txt
@@ -0,0 +1,1 @@
+1.0b2pre
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -72,26 +72,27 @@ PREF_JS_EXPORTS = $(srcdir)/defaults/pre
 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_2_BRANCH
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 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) \
            $(NULL)
--- a/calendar/timezones/install.rdf
+++ b/calendar/timezones/install.rdf
@@ -45,33 +45,33 @@
 
     <!-- Target Application this extension can install into,
          with minimum and maximum supported versions. -->
     <em:targetApplication>
       <Description>
         <!-- Sunbird; we define an upper limit, because we come
              with a top-notch calendar-timezones.xpi on every release -->
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
-        <em:minVersion>1.1a1pre</em:minVersion>
+        <em:minVersion>0.9</em:minVersion>
         <em:maxVersion>@CALENDAR_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
       <Description>
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>3.1a1pre</em:minVersion>
+        <em:minVersion>2.0</em:minVersion>
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
       <Description>
         <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.1a1pre</em:minVersion>
+        <em:minVersion>2.0</em:minVersion>
         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
        </Description>
      </em:targetApplication>
 
     <em:name>Timezone Definitions for Mozilla Calendar</em:name>
     <em:description>Timezone definitions required by Sunbird and Lightning</em:description>
     <em:creator>Mozilla Calendar Project</em:creator>
     <em:iconURL>chrome://calendar-timezones/skin/addon-icon32.png</em:iconURL>