Bug 616848 - Remove LIGHTNING_FIREFOX. r=Fallen
authorMartin Schroeder <mschroeder@mozilla.x-home.org>
Mon, 13 Dec 2010 23:06:38 +0100
changeset 6830 d1a2d5ec19b724f40aaf9a5b76e13a3444e2fb9b
parent 6829 d1e3e4add0fedb9d61a3ff95fba76036554d9563
child 6831 0b4c2f8b864ba456742c9276e403c1563e17cc9b
push id5238
push usermschroeder@mozilla.x-home.org
push dateMon, 13 Dec 2010 22:07:02 +0000
treeherdercomm-central@d1a2d5ec19b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs616848
Bug 616848 - Remove LIGHTNING_FIREFOX. r=Fallen
calendar/lightning/Makefile.in
calendar/lightning/install.rdf
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -55,19 +55,16 @@ XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41
 STRIP_XPI = 1
 DIST_FILES = install.rdf application.ini
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 
 # Lighting version number
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
-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
 
 # Gecko milestone
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 ifdef GRE_MILESTONE
@@ -117,29 +114,26 @@ DIRS = ../libical \
        ../itip \
        components \
        locales \
        $(NULL)
 
 # Select a theme from which to pull our skin goodness
 # OS X: pinstripe
 # Others: winstripe
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 THEME=pinstripe
 else
 THEME=winstripe
 endif
 
 DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DAB_CD=$(AB_CD) \
-           -DFIREFOX_VERSION=$(FIREFOX_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
-           -DLIGHTNING_FIREFOX=$(LIGHTNING_FIREFOX) \
            -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
            -DXPI_EM_ID=$(XPI_EM_ID) \
            -DTHEME=$(THEME) \
            $(NULL)
 
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
@@ -155,10 +149,8 @@ ident:
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
 	    $(FINAL_TARGET)/application.ini App SourceStamp
 	@printf "moz_revision "
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
 	    $(FINAL_TARGET)/application.ini Build SourceStamp
 	@printf "buildid "
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
 	    $(FINAL_TARGET)/application.ini App BuildID
-
-
--- a/calendar/lightning/install.rdf
+++ b/calendar/lightning/install.rdf
@@ -1,40 +1,26 @@
 <?xml version="1.0"?>
 
 #filter substitution
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
-    <!-- Target Application this extension can install into, 
-        with minimum and maximum supported versions. --> 
+    <!-- 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>
         <em:minVersion>3.2a1pre</em:minVersion>
         <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. -->
-    <em:targetApplication>
-      <Description>
-        <!-- firefox -->
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>@FIREFOX_VERSION@</em:minVersion>
-        <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-#endif
-
     <em:targetApplication>
       <Description>
         <!-- seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1a1pre</em:minVersion>
         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>