Fix bug 411958 (part1, gdata files) - Use tinderboxen to build gdata-provider nightlies. r=ause

calendar/providers/Makefile.in

@@ -46,6 +46,14 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = calprovs
 MODULE_NAME = calProviderModule
 
-DIRS = memory storage composite caldav ics wcap base
+DIRS = base \
+       caldav \
+       composite \
+       gdata \
+       ics \
+       memory \
+       storage \
+       wcap \
+	   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

calendar/providers/gdata/Makefile.in

@@ -47,9 +47,13 @@ export USE_EXTENSION_MANIFEST = 1
 export XPI_NAME = gdata-provider
 DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider
-DEFINES += -DAB_CD=$(AB_CD)
 STRIP_XPI = 1
 
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
+DEFINES += -DAB_CD=$(AB_CD) \
+           -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
+           $(NULL)
+
 PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
 DIRS = components
 

calendar/providers/gdata/install.rdf

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+#filter substitution
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
@@ -49,8 +50,8 @@
       <Description>
         <!-- sunbird -->
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
-        <em:minVersion>0.8pre</em:minVersion>
-        <em:maxVersion>0.8</em:maxVersion>
+        <em:minVersion>@CALENDAR_VERSION@</em:minVersion>
+        <em:maxVersion>@CALENDAR_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -66,8 +67,8 @@
       <Description>
         <!-- Lightning (also Sunbird via extension stub) -->
         <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
-        <em:minVersion>0.8pre</em:minVersion>
-        <em:maxVersion>0.8</em:maxVersion>
+        <em:minVersion>@CALENDAR_VERSION@</em:minVersion>
+        <em:maxVersion>@CALENDAR_VERSION@</em:maxVersion>
       </Description>
     </em:requires>